Move inAppMessageLifecycleHandler to OSInAppMessageController

Author: nan-li

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

@@ -45,6 +45,7 @@ class OSInAppMessageController extends OSBackgroundManager implements OSDynamicT
 
     private OSSystemConditionController systemConditionController;
     private OSInAppMessageRepository inAppMessageRepository;
+    private OSInAppMessageLifecycleHandler inAppMessageLifecycleHandler;
 
     OSTriggerController triggerController;
 
@@ -349,38 +350,42 @@ void onMessageActionOccurredOnPreview(@NonNull final OSInAppMessageInternal mess
 
     /**
      * IAM Lifecycle methods
-     * The following methods call the public inAppMessageLifecycleHandler callbacks
+     * The following methods call the public OSInAppMessageLifecycleHandler callbacks
      */
+    void setInAppMessageLifecycleHandler(@Nullable OSInAppMessageLifecycleHandler handler) {
+        inAppMessageLifecycleHandler = handler;
+    }
+
     void onMessageWillDisplay(@NonNull final OSInAppMessageInternal message) {
-        if (OneSignal.inAppMessageLifecycleHandler == null) {
+        if (inAppMessageLifecycleHandler == null) {
             logger.verbose("OSInAppMessageController onMessageWillDisplay: inAppMessageLifecycleHandler is null");
             return;
         }
-        OneSignal.inAppMessageLifecycleHandler.onWillDisplayInAppMessage(message);
+        inAppMessageLifecycleHandler.onWillDisplayInAppMessage(message);
     }
 
     void onMessageDidDisplay(@NonNull final OSInAppMessageInternal message) {
-        if (OneSignal.inAppMessageLifecycleHandler == null) {
+        if (inAppMessageLifecycleHandler == null) {
             logger.verbose("OSInAppMessageController onMessageDidDisplay: inAppMessageLifecycleHandler is null");
             return;
         }
-        OneSignal.inAppMessageLifecycleHandler.onDidDisplayInAppMessage(message);
+        inAppMessageLifecycleHandler.onDidDisplayInAppMessage(message);
     }
 
     void onMessageWillDismiss(@NonNull final OSInAppMessageInternal message) {
-        if (OneSignal.inAppMessageLifecycleHandler == null) {
+        if (inAppMessageLifecycleHandler == null) {
             logger.verbose("OSInAppMessageController onMessageWillDismiss: inAppMessageLifecycleHandler is null");
             return;
         }
-        OneSignal.inAppMessageLifecycleHandler.onWillDismissInAppMessage(message);
+        inAppMessageLifecycleHandler.onWillDismissInAppMessage(message);
     }
 
     void onMessageDidDismiss(@NonNull final OSInAppMessageInternal message) {
-        if (OneSignal.inAppMessageLifecycleHandler == null) {
+        if (inAppMessageLifecycleHandler == null) {
             logger.verbose("OSInAppMessageController onMessageDidDismiss: inAppMessageLifecycleHandler is null");
             return;
         }
-        OneSignal.inAppMessageLifecycleHandler.onDidDismissInAppMessage(message);
+        inAppMessageLifecycleHandler.onDidDismissInAppMessage(message);
     }
 
     /* End IAM Lifecycle methods */

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

@@ -28,6 +28,7 @@ class OSTaskRemoteController extends OSTaskController {
     static final String REMOVE_GROUPED_NOTIFICATIONS = "removeGroupedNotifications()";
     static final String REMOVE_NOTIFICATION = "removeNotification()";
     static final String PAUSE_IN_APP_MESSAGES = "pauseInAppMessages()";
+    static final String SET_IN_APP_MESSAGE_LIFECYCLE_HANDLER = "setInAppMessageLifecycleHandler()";
     static final String APP_LOST_FOCUS = "onAppLostFocus()";
     static final String SEND_OUTCOME = "sendOutcome()";
     static final String SEND_UNIQUE_OUTCOME = "sendUniqueOutcome()";

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

@@ -376,7 +376,6 @@ static Activity getCurrentActivity() {
    static OSNotificationWillShowInForegroundHandler notificationWillShowInForegroundHandler;
    static OSNotificationOpenedHandler notificationOpenedHandler;
    static OSInAppMessageClickHandler inAppMessageClickHandler;
-   static OSInAppMessageLifecycleHandler inAppMessageLifecycleHandler;
 
    // Is the init() of OneSignal SDK finished yet
    private static boolean initDone;
@@ -741,8 +740,20 @@ public static void setNotificationWillShowInForegroundHandler(@Nullable OSNotifi
       notificationWillShowInForegroundHandler = callback;
    }
 
-   public static void setInAppMessageLifecycleHandler(@Nullable OSInAppMessageLifecycleHandler handler) {
-      inAppMessageLifecycleHandler = handler;
+   public static void setInAppMessageLifecycleHandler(@Nullable final OSInAppMessageLifecycleHandler handler) {
+      if (appContext == null) {
+         logger.error("Waiting initWithContext. " +
+                 "Moving " + OSTaskRemoteController.SET_IN_APP_MESSAGE_LIFECYCLE_HANDLER + " operation to a pending task queue.");
+         taskRemoteController.addTaskToQueue(new Runnable() {
+            @Override
+            public void run() {
+               logger.debug("Running " + OSTaskRemoteController.SET_IN_APP_MESSAGE_LIFECYCLE_HANDLER + " operation from pending queue.");
+               setInAppMessageLifecycleHandler(handler);
+            }
+         });
+         return;
+      }
+      getInAppMessageController().setInAppMessageLifecycleHandler(handler);
    }
 
    public static void setNotificationOpenedHandler(@Nullable OSNotificationOpenedHandler callback) {