Skip to content

Commit d006c5b

Browse files
committed
Add completionHandler to setLanguage
* Add setLanguage with completion handler * setLanguage without completion handler calls null on completion handler * Add OSDeviceInfo completion handler to setLanguage
1 parent 1fc53c6 commit d006c5b

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

OneSignalSDK/onesignal/src/main/java/com/onesignal/OneSignal.java

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1490,7 +1490,7 @@ private static void registerUserTask() throws JSONException {
14901490
deviceInfo.put("carrier", osUtils.getCarrierName());
14911491
deviceInfo.put("rooted", RootToolsInternalMethods.isRooted());
14921492

1493-
OneSignalStateSynchronizer.updateDeviceInfo(deviceInfo);
1493+
OneSignalStateSynchronizer.updateDeviceInfo(deviceInfo, null);
14941494

14951495
JSONObject pushState = new JSONObject();
14961496
pushState.put("identifier", lastRegistrationId);
@@ -1716,14 +1716,18 @@ public void run() {
17161716
}
17171717

17181718
public static void setLanguage(@NonNull final String language) {
1719+
setLanguage(language, null);
1720+
}
1721+
1722+
public static void setLanguage(@NonNull final String language, @Nullable final OSDeviceInfoCompletionHandler completionCallback) {
17191723
if (taskRemoteController.shouldQueueTaskForInit(OSTaskRemoteController.SET_LANGUAGE)) {
17201724
logger.error("Waiting for remote params. " +
17211725
"Moving " + OSTaskRemoteController.SET_LANGUAGE + " operation to a pending task queue.");
17221726
taskRemoteController.addTaskToQueue(new Runnable() {
17231727
@Override
17241728
public void run() {
17251729
logger.debug("Running " + OSTaskRemoteController.SET_LANGUAGE + " operation from pending task queue.");
1726-
setLanguage(language);
1730+
setLanguage(language, completionCallback);
17271731
}
17281732
});
17291733
return;
@@ -1739,7 +1743,7 @@ public void run() {
17391743
try {
17401744
JSONObject deviceInfo = new JSONObject();
17411745
deviceInfo.put("language", languageContext.getLanguage());
1742-
OneSignalStateSynchronizer.updateDeviceInfo(deviceInfo);
1746+
OneSignalStateSynchronizer.updateDeviceInfo(deviceInfo, completionCallback);
17431747
} catch (JSONException exception) {
17441748
exception.printStackTrace();
17451749
}

0 commit comments

Comments
 (0)