Move strings to constants

* Move "en" string to constant in LanguageProviderAppDefined class
* Move Corrected Language Strings to constant in LanguageProviderDevice class
* Add OSTaskRemoteController.SET_LANGUAGE in place of setLanguage() string in OneSignal.setLanguage

Author: tanaynigam

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

@@ -1600,7 +1600,7 @@ public void run() {
          return;
       }
 
-      if (shouldLogUserPrivacyConsentErrorMessageForMethodName("setLanguage()"))
+      if (shouldLogUserPrivacyConsentErrorMessageForMethodName(OSTaskRemoteController.SET_LANGUAGE))
          return;
 
       LanguageProviderAppDefined languageProviderAppDefined = new LanguageProviderAppDefined(preferences);

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

@@ -5,7 +5,9 @@
 
 public class LanguageProviderAppDefined implements LanguageProvider {
     public static final String PREFS_OS_LANGUAGE = "PREFS_OS_LANGUAGE";
-    private OSSharedPreferences preferences;
+
+    private static final String DEFAULT_LANGUAGE = "en";
+    private final OSSharedPreferences preferences;
 
     public LanguageProviderAppDefined(OSSharedPreferences preferences) {
         this.preferences = preferences;
@@ -21,6 +23,6 @@ public void setLanguage(String language) {
     @NonNull
     public String getLanguage() {
         return preferences.getString(
-                preferences.getPreferencesName(), PREFS_OS_LANGUAGE, "en");
+                preferences.getPreferencesName(), PREFS_OS_LANGUAGE, DEFAULT_LANGUAGE);
     }
 }

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

@@ -5,22 +5,31 @@
 import java.util.Locale;
 
 public class LanguageProviderDevice implements LanguageProvider {
-    public String getLanguage() {
-        String lang = Locale.getDefault().getLanguage();
-
-        // https://github.com/OneSignal/OneSignal-Android-SDK/issues/64
-        if (lang.equals("iw"))
-            return "he";
-        if (lang.equals("in"))
-            return "id";
-        if (lang.equals("ji"))
-            return "yi";
+    private static final String HEBREW_INCORRECT = "iw";
+    private static final String HEBREW_CORRECTED = "he";
+    private static final String INDONESIAN_INCORRECT = "in";
+    private static final String INDONESIAN_CORRECTED = "id";
+    private static final String YIDDISH_INCORRECT = "ji";
+    private static final String YIDDISH_CORRECTED = "yi";
+    private static final String CHINESE = "zh";
 
-        // https://github.com/OneSignal/OneSignal-Android-SDK/issues/98
-        if (lang.equals("zh"))
-            return lang + "-" + Locale.getDefault().getCountry();
     @NonNull
+    public String getLanguage() {
+        String language = Locale.getDefault().getLanguage();
 
-        return lang;
+        switch (language) {
+            // https://github.com/OneSignal/OneSignal-Android-SDK/issues/64
+            case HEBREW_INCORRECT:
+                return HEBREW_CORRECTED;
+            case INDONESIAN_INCORRECT:
+                return INDONESIAN_CORRECTED;
+            case YIDDISH_INCORRECT:
+                return YIDDISH_CORRECTED;
+            // https://github.com/OneSignal/OneSignal-Android-SDK/issues/98
+            case CHINESE:
+                return language + "-" + Locale.getDefault().getCountry();
+            default:
+                return language;
+        }
     }
 }