Skip to content

Commit 2344a51

Browse files
committed
Move OneSignal.setLanguage executable order
* Move order of class initializations of classes LanguageProviderAppDefined, LanguageContext * Move order of run command of runnable runSetLanguage
1 parent 242ee10 commit 2344a51

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

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

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -791,8 +791,6 @@ public static void init(Context context, String googleProjectNumber, String oneS
791791
initDone = true;
792792

793793
outcomeEventsController.sendSavedOutcomes();
794-
// Set Language Context to null
795-
languageContext = new LanguageContext(preferences);
796794

797795
// Clean up any pending tasks that were queued up before initialization
798796
startPendingTasks();
@@ -1583,6 +1581,10 @@ public static void setLanguage(@NonNull final String language) {
15831581
Runnable runSetLanguage = new Runnable() {
15841582
@Override
15851583
public void run() {
1584+
LanguageProviderAppDefined languageProviderAppDefined = new LanguageProviderAppDefined(preferences);
1585+
languageProviderAppDefined.setLanguage(language);
1586+
languageContext.setStrategy(languageProviderAppDefined);
1587+
15861588
try {
15871589
JSONObject deviceInfo = new JSONObject();
15881590
deviceInfo.put("language", languageContext.getLanguage());
@@ -1592,7 +1594,6 @@ public void run() {
15921594
}
15931595
}
15941596
};
1595-
runSetLanguage.run();
15961597

15971598
// If either the app context is null or the waiting queue isn't done (to preserve operation order)
15981599
if (appContext == null || shouldRunTaskThroughQueue()) {
@@ -1603,9 +1604,7 @@ public void run() {
16031604
if (shouldLogUserPrivacyConsentErrorMessageForMethodName("setLanguage()"))
16041605
return;
16051606

1606-
LanguageProviderAppDefined languageProviderAppDefined = new LanguageProviderAppDefined(preferences);
1607-
languageProviderAppDefined.setLanguage(language);
1608-
languageContext.setStrategy(languageProviderAppDefined);
1607+
runSetLanguage.run();
16091608
}
16101609

16111610
public static void setExternalUserId(@NonNull final String externalId) {

0 commit comments

Comments
 (0)