Fill out lifecycle method calls in OSInAppMessageController

Author: nan-li

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

@@ -346,15 +346,35 @@ void onMessageActionOccurredOnPreview(@NonNull final OSInAppMessageInternal mess
 
     /* IAM Lifecycle */
     void onMessageWillDisplay(@NonNull final OSInAppMessageInternal message) {
+        if (OneSignal.inAppMessageLifecycleHandler == null) {
+            OneSignal.onesignalLog(OneSignal.LOG_LEVEL.VERBOSE, "OSInAppMessageController onMessageWillDisplay: inAppMessageLifecycleHandler is null");
+            return;
+        }
+        OneSignal.inAppMessageLifecycleHandler.onWillDisplayInAppMessage(message);
     }
 
     void onMessageDidDisplay(@NonNull final OSInAppMessageInternal message) {
+        if (OneSignal.inAppMessageLifecycleHandler == null) {
+            OneSignal.onesignalLog(OneSignal.LOG_LEVEL.VERBOSE, "OSInAppMessageController onMessageDidDisplay: inAppMessageLifecycleHandler is null");
+            return;
+        }
+        OneSignal.inAppMessageLifecycleHandler.onDidDisplayInAppMessage(message);
     }
 
     void onMessageWillDismiss(@NonNull final OSInAppMessageInternal message) {
+        if (OneSignal.inAppMessageLifecycleHandler == null) {
+            OneSignal.onesignalLog(OneSignal.LOG_LEVEL.VERBOSE, "OSInAppMessageController onMessageWillDismiss: inAppMessageLifecycleHandler is null");
+            return;
+        }
+        OneSignal.inAppMessageLifecycleHandler.onWillDismissInAppMessage(message);
     }
 
     void onMessageDidDismiss(@NonNull final OSInAppMessageInternal message) {
+        if (OneSignal.inAppMessageLifecycleHandler == null) {
+            OneSignal.onesignalLog(OneSignal.LOG_LEVEL.VERBOSE, "OSInAppMessageController onMessageDidDismiss: inAppMessageLifecycleHandler is null");
+            return;
+        }
+        OneSignal.inAppMessageLifecycleHandler.onDidDismissInAppMessage(message);
     }
 
     private void logInAppMessagePreviewActions(final OSInAppMessageAction action) {

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

@@ -376,6 +376,7 @@ static Activity getCurrentActivity() {
    static OSNotificationWillShowInForegroundHandler notificationWillShowInForegroundHandler;
    static OSNotificationOpenedHandler notificationOpenedHandler;
    static OSInAppMessageClickHandler inAppMessageClickHandler;
+   static OSIAMLifecycleHandler inAppMessageLifecycleHandler;
 
    // Is the init() of OneSignal SDK finished yet
    private static boolean initDone;
@@ -741,7 +742,7 @@ public static void setNotificationWillShowInForegroundHandler(@Nullable OSNotifi
    }
 
    public static void setIAMLifecycleHandler(@Nullable OSIAMLifecycleHandler handler) {
-
+      inAppMessageLifecycleHandler = handler;
    }
 
    public static void setNotificationOpenedHandler(@Nullable OSNotificationOpenedHandler callback) {