Add LanguageContext Dependency to OSInAppMessageController

* Add LanguageContext dependency to OSInAppMessageController constructor
* Add LanguageContext dependency to OSInAppMessageControllerFactory constructor
* Add LanguageContext dependency to OSInAppMessageDummyController
* Rename languageIdentifier to language in OSInAppMessageController variantIdentifier

Author: tanaynigam

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

@@ -9,6 +9,7 @@
 
 import com.onesignal.OSDynamicTriggerController.OSDynamicTriggerControllerObserver;
 import com.onesignal.OneSignalRestClient.ResponseHandler;
+import com.onesignal.language.LanguageContext;
 
 import org.json.JSONArray;
 import org.json.JSONException;
@@ -34,6 +35,7 @@ class OSInAppMessageController implements OSDynamicTriggerControllerObserver, OS
     public static final String IN_APP_MESSAGES_JSON_KEY = "in_app_messages";
     private static final String OS_SAVE_IN_APP_MESSAGE = "OS_SAVE_IN_APP_MESSAGE";
     private static final Object LOCK = new Object();
+    private final LanguageContext languageContext;
 
     OSTriggerController triggerController;
     private OSSystemConditionController systemConditionController;
@@ -70,14 +72,15 @@ class OSInAppMessageController implements OSDynamicTriggerControllerObserver, OS
     Date lastTimeInAppDismissed = null;
     private int htmlNetworkRequestAttemptCount = 0;
 
-    protected OSInAppMessageController(OneSignalDbHelper dbHelper) {
+    protected OSInAppMessageController(OneSignalDbHelper dbHelper, LanguageContext languageContext) {
         messages = new ArrayList<>();
         dismissedMessages = OSUtils.newConcurrentSet();
         messageDisplayQueue = new ArrayList<>();
         impressionedMessages = OSUtils.newConcurrentSet();
         clickedClickIds = OSUtils.newConcurrentSet();
         triggerController = new OSTriggerController(this);
         systemConditionController = new OSSystemConditionController(this);
+        this.languageContext = languageContext;
 
         Set<String> tempDismissedSet = OneSignalPrefs.getStringSet(
                 OneSignalPrefs.PREFS_ONESIGNAL,
@@ -210,15 +213,15 @@ private void evaluateInAppMessages() {
     }
 
     private @Nullable String variantIdForMessage(@NonNull OSInAppMessage message) {
-        String languageIdentifier = OneSignal.languageContext.getLanguage();
+        String language = languageContext.getLanguage();
 
         for (String variant : PREFERRED_VARIANT_ORDER) {
             if (!message.variants.containsKey(variant))
                 continue;
 
             HashMap<String, String> variantMap = message.variants.get(variant);
-            if (variantMap.containsKey(languageIdentifier))
-                return variantMap.get(languageIdentifier);
+            if (variantMap.containsKey(language))
+                return variantMap.get(language);
             return variantMap.get("default");
         }
 

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

@@ -29,21 +29,23 @@
 
 import android.os.Build;
 
+import com.onesignal.language.LanguageContext;
+
 class OSInAppMessageControllerFactory {
 
     private static final Object LOCK = new Object();
 
     private OSInAppMessageController controller;
 
-    public OSInAppMessageController getController(OneSignalDbHelper dbHelper) {
+    public OSInAppMessageController getController(OneSignalDbHelper dbHelper, LanguageContext languageContext) {
         if (controller == null) {
             synchronized (LOCK) {
                 if (controller == null) {
                     // Make sure only Android 4.4 devices and higher can use IAMs
                     if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.JELLY_BEAN_MR2)
-                        controller = new OSInAppMessageDummyController(null);
+                        controller = new OSInAppMessageDummyController(null, languageContext);
                     else
-                        controller = new OSInAppMessageController(dbHelper);
+                        controller = new OSInAppMessageController(dbHelper, languageContext);
                 }
             }
         }

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

@@ -3,6 +3,8 @@
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 
+import com.onesignal.language.LanguageContext;
+
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -17,8 +19,8 @@ class OSInAppMessageDummyController extends OSInAppMessageController {
      * This is a dummy controller that will be used for Android 4.3 and older devices
      * All methods should be overridden and as empty as possible (few return exceptions)
      */
-    OSInAppMessageDummyController(OneSignalDbHelper dbHelper) {
-        super(dbHelper);
+    OSInAppMessageDummyController(OneSignalDbHelper dbHelper, LanguageContext languageContext) {
+        super(dbHelper, languageContext);
     }
 
     @Override

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

@@ -465,7 +465,7 @@ public void onSessionEnding(@NonNull List<OSInfluence> lastInfluences) {
 
    private static OSInAppMessageControllerFactory inAppMessageControllerFactory = new OSInAppMessageControllerFactory();
    static OSInAppMessageController getInAppMessageController() {
-      return inAppMessageControllerFactory.getController(getDBHelperInstance());
+      return inAppMessageControllerFactory.getController(getDBHelperInstance(), languageContext);
    }
    private static OSLogger logger = new OSLogWrapper();
    private static OneSignalAPIClient apiClient = new OneSignalRestClientWrapper();