Moved getCorrectedLanguage from OSUtils to LanguageProviderDevice

* Moved the implementation of OSUtils.getCorrectedLanguage to LanguageProviderDevice.getLanguage

Author: tanaynigam

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

@@ -60,7 +60,6 @@
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Iterator;
-import java.util.Locale;
 import java.util.Set;
 import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
@@ -437,24 +436,6 @@ static String getResourceString(Context context, String key, String defaultStr)
       return defaultStr;
    }
 
-   static String getCorrectedLanguage() {
-      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";
-
-      // https://github.com/OneSignal/OneSignal-Android-SDK/issues/98
-      if (lang.equals("zh"))
-         return lang + "-" + Locale.getDefault().getCountry();
-
-      return lang;
-   }
-
    static boolean isValidEmail(String email) {
       if (email == null)
          return false;

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

@@ -1,9 +1,23 @@
 package com.onesignal.language;
 
-import com.onesignal.OSUtils;
+import java.util.Locale;
 
 public class LanguageProviderDevice implements LanguageProvider{
     public String getLanguage() {
-        return OSUtils.getCorrectedLanguage();
+        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";
+
+        // https://github.com/OneSignal/OneSignal-Android-SDK/issues/98
+        if (lang.equals("zh"))
+            return lang + "-" + Locale.getDefault().getCountry();
+
+        return lang;
     }
 }