Merge pull request #540 from Iterable/MOB-5983-Refactor

[MOB-5983] - Refactor code

Author: Ayyanchira

iterableapi/src/main/java/com/iterable/iterableapi/IterableApi.java

@@ -500,7 +500,7 @@ public static void initialize(@NonNull Context context, @NonNull String apiKey,
         }
 
         if (sharedInstance.embeddedManager == null) {
-            sharedInstance.embeddedManager = new IterableEmbeddedManager(sharedInstance._applicationContext, sharedInstance.config.embeddedMessagingAutoFetchInterval, null, null);
+            sharedInstance.embeddedManager = new IterableEmbeddedManager(sharedInstance.config.embeddedMessagingAutoFetchInterval, null, null);
         }
 
         loadLastSavedConfiguration(context);

iterableapi/src/main/java/com/iterable/iterableapi/IterableEmbeddedManager.kt

@@ -1,6 +1,5 @@
 package com.iterable.iterableapi
 
-import android.content.Context
 import android.os.Handler
 import android.os.Looper
 import androidx.lifecycle.LiveData
@@ -38,7 +37,6 @@ public class IterableEmbeddedManager: IterableActivityMonitor.AppStateCallback{
 
     //Constructor of this class with actionHandler and updateHandler
     public constructor(
-        context: Context,
         autoFetchInterval: Double,
         actionHandler: EmbeddedMessageActionHandler?,
         updateHandler: EmbeddedMessageUpdateHandler?
@@ -130,27 +128,14 @@ public class IterableEmbeddedManager: IterableActivityMonitor.AppStateCallback{
                         for (i in 0 until jsonArray.length()) {
                             val messageJson = jsonArray.optJSONObject(i)
                             val message = IterableEmbeddedMessage.fromJSONObject(messageJson)
-                            if (message != null) {
-                                remoteMessageList.add(message)
-                            } else {
-                                IterableLogger.e(TAG, "message turned out to be null")
-                            }
+                            remoteMessageList.add(message)
                         }
                     } else {
                         IterableLogger.e(TAG, "Array not found in embedded message response. Probably a parsing failure")
                     }
-//                    //Directly saving the messages to the list
-//                    //TODO: Check and make note of the changes and call the updateHandler accordinly
-//                    //TODO: Check for new messages and call delivery on the new ones
-
                     updateLocalMessages(remoteMessageList)
                     IterableLogger.v(TAG, "$localMessages")
 
-//                    //Saving the time of last sync
-                    IterableLogger.v(TAG, "Resetting last sync time")
-
-                    //TODO: Is this line necessary? Because we are updating it at the end anyways.
-//                    lastSync = IterableUtil.currentTimeMillis()
                 } catch (e: JSONException) {
                     IterableLogger.e(TAG, e.toString())
                 }
@@ -206,10 +191,6 @@ public class IterableEmbeddedManager: IterableActivityMonitor.AppStateCallback{
             //TODO: Make a call to the updateHandler to notify that the message list has been updated
             updateHandleListeners.forEach {
                 IterableLogger.d(TAG, "Calling updateHandler")
-                if(it == null) {
-                    IterableLogger.d(TAG, "updateHandler is null")
-                    return
-                }
                 it.onMessageUpdate()
             }
         }

iterableapi/src/main/java/com/iterable/iterableapi/IterableEmbeddedMessage.kt

@@ -131,17 +131,17 @@ class EmbeddedMessageElements (
                 return null
             }
 
-            val title: String? = elementsJson?.optString(IterableConstants.ITERABLE_EMBEDDED_MESSAGE_TITLE)
-            val body: String? = elementsJson?.optString(IterableConstants.ITERABLE_EMBEDDED_MESSAGE_BODY)
-            val mediaURL: String? = elementsJson?.optString(IterableConstants.ITERABLE_EMBEDDED_MESSAGE_MEDIA_URL)
+            val title: String? = elementsJson.optString(IterableConstants.ITERABLE_EMBEDDED_MESSAGE_TITLE)
+            val body: String? = elementsJson.optString(IterableConstants.ITERABLE_EMBEDDED_MESSAGE_BODY)
+            val mediaURL: String? = elementsJson.optString(IterableConstants.ITERABLE_EMBEDDED_MESSAGE_MEDIA_URL)
 
-            val defaultActionJson: JSONObject? = elementsJson?.optJSONObject(IterableConstants.ITERABLE_EMBEDDED_MESSAGE_DEFAULT_ACTION)
+            val defaultActionJson: JSONObject? = elementsJson.optJSONObject(IterableConstants.ITERABLE_EMBEDDED_MESSAGE_DEFAULT_ACTION)
             var defaultAction: EmbeddedMessageElementsDefaultAction? = null
             if (defaultActionJson != null) {
                 defaultAction = EmbeddedMessageElementsDefaultAction.fromJSONObject(defaultActionJson)
             }
 
-            val buttonsJson: JSONArray? = elementsJson?.optJSONArray(IterableConstants.ITERABLE_EMBEDDED_MESSAGE_BUTTONS)
+            val buttonsJson: JSONArray? = elementsJson.optJSONArray(IterableConstants.ITERABLE_EMBEDDED_MESSAGE_BUTTONS)
             var buttons: MutableList<EmbeddedMessageElementsButton>? = mutableListOf()
             if (buttonsJson != null) {
                 for(i in 0..buttonsJson.length() - 1) {
@@ -153,7 +153,7 @@ class EmbeddedMessageElements (
                 buttons = null
             }
 
-            val textsJson: JSONArray? = elementsJson?.optJSONArray(IterableConstants.ITERABLE_EMBEDDED_MESSAGE_TEXT)
+            val textsJson: JSONArray? = elementsJson.optJSONArray(IterableConstants.ITERABLE_EMBEDDED_MESSAGE_TEXT)
             var texts: MutableList<EmbeddedMessageElementsText>? = mutableListOf()
             if (textsJson != null) {
                 for(i in 0..textsJson.length() - 1) {