Add Android IAM Lifecycle

* Add IAM Lifecycle implementation to OneSignalPlugin.java
* Add convertInAppMessageToMap to OneSignalSerializer

Author: tanaynigam

android/src/main/java/com/onesignal/flutter/OneSignalPlugin.java

@@ -7,6 +7,8 @@
 import com.onesignal.OSEmailSubscriptionObserver;
 import com.onesignal.OSEmailSubscriptionStateChanges;
 import com.onesignal.OSInAppMessageAction;
+import com.onesignal.OSInAppMessage;
+import com.onesignal.OSInAppMessageLifecycleHandler;
 import com.onesignal.OSNotification;
 import com.onesignal.OSNotificationOpenedResult;
 import com.onesignal.OSNotificationReceivedEvent;
@@ -57,6 +59,12 @@ public class OneSignalPlugin
   private boolean hasSetRequiresPrivacyConsent = false;
   private boolean waitingForUserPrivacyConsent = false;
 
+  private OSInAppMessage inAppMessage;
+  private boolean hasSetOnWillDisplayInAppMessageHandler = false;
+  private boolean hasSetOnDidDisplayInAppMessageHandler = false;
+  private boolean hasSetOnWillDismissInAppMessageHandler = false;
+  private boolean hasSetOnDidDismissInAppMessageHandler = false;
+
   private final HashMap<String, OSNotificationReceivedEvent> notificationReceivedEventCache = new HashMap<>();
 
   public OneSignalPlugin() {
@@ -160,6 +168,14 @@ else if (call.method.contentEquals("OneSignal#initNotificationOpenedHandlerParam
       this.initNotificationOpenedHandlerParams();
     else if (call.method.contentEquals("OneSignal#initInAppMessageClickedHandlerParams"))
       this.initInAppMessageClickedHandlerParams();
+    else if (call.method.contentEquals("OneSignal#onWillDisplayInAppMessageHandlerParams"))
+      this.OnWillDisplayInAppMessageHandlerParams();
+    else if (call.method.contentEquals("OneSignal#onDidDisplayInAppMessageHandlerParams"))
+      this.OnWillDisplayInAppMessageHandlerParams();  
+    else if (call.method.contentEquals("OneSignal#onWillDismissInAppMessageHandlerParams"))
+      this.OnWillDisplayInAppMessageHandlerParams();  
+    else if (call.method.contentEquals("OneSignal#onDidDismissInAppMessageHandlerParams"))
+      this.OnWillDisplayInAppMessageHandlerParams();  
     else if (call.method.contentEquals("OneSignal#initNotificationWillShowInForegroundHandlerParams"))
       this.initNotificationWillShowInForegroundHandlerParams();
     else if (call.method.contentEquals("OneSignal#completeNotification"))
@@ -183,6 +199,7 @@ private void setAppId(MethodCall call, Result reply) {
     OneSignal.setInAppMessageClickHandler(this);
     OneSignal.initWithContext(context);
     OneSignal.setAppId(appId);
+    setInAppMessageLifecycleHandler();
 
     if (hasSetRequiresPrivacyConsent && !OneSignal.userProvidedPrivacyConsent())
       this.waitingForUserPrivacyConsent = true;
@@ -409,6 +426,99 @@ public void inAppMessageClicked(OSInAppMessageAction action) {
     invokeMethodOnUiThread("OneSignal#handleClickedInAppMessage", OneSignalSerializer.convertInAppMessageClickedActionToMap(action));
   }
 
+  /* in app message lifecycle */
+  private void OnWillDisplayInAppMessageHandlerParams() {
+    this.hasSetOnWillDisplayInAppMessageHandler = true;
+    if(this.inAppMessage != null) {
+        this.onWillDisplayInAppMessageFlutter(this.inAppMessage);
+        this.inAppMessage = null;
+    }
+  }
+
+  private void OnDidDisplayInAppMessageHandlerParams() {
+      this.hasSetOnDidDisplayInAppMessageHandler = true;
+      if(this.inAppMessage != null) {
+          this.onDidDisplayInAppMessageFlutter(this.inAppMessage);
+          this.inAppMessage = null;
+      }
+  }
+
+  private void OnWillDismissInAppMessageHandlerParams() {
+      this.hasSetOnWillDismissInAppMessageHandler = true;
+      if(this.inAppMessage != null) {
+          this.onWillDismissInAppMessageFlutter(this.inAppMessage);
+          this.inAppMessage = null;
+      }
+  }
+
+  private void OnDidDismissInAppMessageHandlerParams() {
+      this.hasSetOnDidDismissInAppMessageHandler = true;
+      if(this.inAppMessage != null) {
+          this.onDidDismissInAppMessageFlutter(this.inAppMessage);
+          this.inAppMessage = null;
+      }
+  }
+
+  public void setInAppMessageLifecycleHandler() {
+    OneSignal.setInAppMessageLifecycleHandler(new OSInAppMessageLifecycleHandler() {
+        @Override
+        public void onWillDisplayInAppMessage(OSInAppMessage message) { 
+          onWillDisplayInAppMessageFlutter(message);
+        }
+
+        @Override
+        public void onDidDisplayInAppMessage(OSInAppMessage message) {
+          onDidDisplayInAppMessageFlutter(message);
+        }
+
+        @Override
+        public void onWillDismissInAppMessage(OSInAppMessage message) {
+          onWillDismissInAppMessageFlutter(message);
+        }
+
+        @Override
+        public void onDidDismissInAppMessage(OSInAppMessage message) {
+          onDidDismissInAppMessageFlutter(message);
+        }
+    });
+  }
+
+  public void onWillDisplayInAppMessageFlutter(OSInAppMessage message) {
+    if (!this.hasSetOnWillDisplayInAppMessageHandler) {
+      this.inAppMessage = message;
+      return;
+    }
+    
+    invokeMethodOnUiThread("OneSignal#onWillDisplayInAppMessage", OneSignalSerializer.convertInAppMessageToMap(message));
+  }
+
+  public void onDidDisplayInAppMessageFlutter(OSInAppMessage message) {
+    if (!this.hasSetOnDidDisplayInAppMessageHandler) {
+      this.inAppMessage = message;
+      return;
+    }
+      
+    invokeMethodOnUiThread("OneSignal#onDidDisplayInAppMessage", OneSignalSerializer.convertInAppMessageToMap(message));
+  }
+
+  public void onWillDismissInAppMessageFlutter(OSInAppMessage message) {
+    if (!this.hasSetOnWillDismissInAppMessageHandler) {
+      this.inAppMessage = message;
+      return;
+    }
+
+    invokeMethodOnUiThread("OneSignal#onWillDismissInAppMessage", OneSignalSerializer.convertInAppMessageToMap(message));
+  }
+
+  public void onDidDismissInAppMessageFlutter(OSInAppMessage message) {
+    if (!this.hasSetOnDidDismissInAppMessageHandler) {
+      this.inAppMessage = message;
+      return;
+    }
+      
+    invokeMethodOnUiThread("OneSignal#onDidDismissInAppMessage", OneSignalSerializer.convertInAppMessageToMap(message));
+  }
+
   @Override
   public void notificationWillShowInForeground(OSNotificationReceivedEvent notificationReceivedEvent) {
     if (!this.hasSetNotificationWillShowInForegroundHandler) {

android/src/main/java/com/onesignal/flutter/OneSignalSerializer.java

@@ -6,6 +6,7 @@
 import com.onesignal.OSEmailSubscriptionState;
 import com.onesignal.OSEmailSubscriptionStateChanges;
 import com.onesignal.OSInAppMessageAction;
+import com.onesignal.OSInAppMessage;
 import com.onesignal.OSNotification;
 import com.onesignal.OSNotificationAction;
 import com.onesignal.OSNotificationOpenedResult;
@@ -232,6 +233,14 @@ static HashMap<String, Object> convertInAppMessageClickedActionToMap(OSInAppMess
         return hash;
     }
 
+    static HashMap<String, Object> convertInAppMessageToMap(OSInAppMessage message) {
+        HashMap<String, Object> hash = new HashMap<>();
+
+        hash.put("message_id", message.getMessageId());
+
+        return hash;
+    }
+
     static HashMap<String, Object> convertNotificationReceivedEventToMap(OSNotificationReceivedEvent notificationReceivedEvent) throws JSONException {
         return convertNotificationToMap(notificationReceivedEvent.getNotification());
     }