Skip to content

Commit 96be3b3

Browse files
committed
Moved access of Language classes for OneSignalPrefs
* Made OneSignal.preferences public for accessibility in Language classes * Moved callbacks for OneSignalPrefs from LanguageContext and LanguageProviderAppDefined classes to OneSignal.preferences
1 parent 6944777 commit 96be3b3

File tree

3 files changed

+8
-12
lines changed

3 files changed

+8
-12
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -419,7 +419,7 @@ static Activity getCurrentActivity() {
419419
private static String userId = null, emailId = null;
420420
private static int subscribableStatus;
421421

422-
private static LanguageContext languageContext = null;
422+
public static LanguageContext languageContext = null;
423423

424424
// Is the init() of OneSignal SDK finished yet
425425
private static boolean initDone;

OneSignalSDK/onesignal/src/main/java/com/onesignal/language/LanguageContext.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.onesignal.language;
2-
import com.onesignal.OSUtils;
3-
import com.onesignal.OneSignalPrefs;
2+
import com.onesignal.OneSignal;
43
import static com.onesignal.language.LanguageProviderAppDefined.PREFS_OS_LANGUAGE;
54

65
/*
@@ -11,8 +10,8 @@ public class LanguageContext {
1110
private LanguageProvider strategy;
1211

1312
public LanguageContext() {
14-
if ( OneSignalPrefs.getString(
15-
OneSignalPrefs.PREFS_ONESIGNAL, PREFS_OS_LANGUAGE, null) != null) {
13+
if ( OneSignal.preferences.getString(
14+
OneSignal.preferences.getPreferencesName(), PREFS_OS_LANGUAGE, null) != null) {
1615
this.strategy = new LanguageProviderAppDefined();
1716
}
1817
else {
Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,18 @@
11
package com.onesignal.language;
2-
3-
import com.onesignal.OSUtils;
42
import com.onesignal.OneSignal;
5-
import com.onesignal.OneSignalPrefs;
63

74
public class LanguageProviderAppDefined implements LanguageProvider{
85
public static final String PREFS_OS_LANGUAGE = "PREFS_OS_LANGUAGE";
96

107
public void setLanguage(String language) {
11-
OneSignalPrefs.saveString(
12-
OneSignalPrefs.PREFS_ONESIGNAL,
8+
OneSignal.preferences.saveString(
9+
OneSignal.preferences.getPreferencesName(),
1310
PREFS_OS_LANGUAGE,
1411
language);
1512
}
1613

1714
public String getLanguage() {
18-
return OneSignalPrefs.getString(
19-
OneSignalPrefs.PREFS_ONESIGNAL, PREFS_OS_LANGUAGE,"en");
15+
return OneSignal.preferences.getString(
16+
OneSignal.preferences.getPreferencesName(), PREFS_OS_LANGUAGE, "en");
2017
}
2118
}

0 commit comments

Comments
 (0)