Rename OSIAMLifecycleHandler to OSInAppMessageLifecycleHandler

Public facing - spell out IAM

Author: nan-li

Examples/OneSignalDemo/app/src/main/java/com/onesignal/sdktest/application/MainApplication.java

@@ -6,8 +6,7 @@
 
 import com.onesignal.OSInAppMessage;
 import com.onesignal.OSNotification;
-import com.onesignal.OSNotificationOpenedResult;
-import com.onesignal.OSIAMLifecycleHandler;
+import com.onesignal.OSInAppMessageLifecycleHandler;
 import com.onesignal.OneSignal;
 import com.onesignal.sdktest.R;
 import com.onesignal.sdktest.constant.Tag;
@@ -22,7 +21,7 @@ public class MainApplication extends MultiDexApplication {
     public void onCreate() {
         super.onCreate();
 
-        OSIAMLifecycleHandler handler = new OSIAMLifecycleHandler() {
+        OSInAppMessageLifecycleHandler handler = new OSInAppMessageLifecycleHandler() {
             @Override
             public void onWillDisplayInAppMessage(OSInAppMessage message) {
                 OneSignal.onesignalLog(OneSignal.LOG_LEVEL.VERBOSE, "MainApplication onWillDisplayInAppMessage");
@@ -41,7 +40,7 @@ public void onDidDismissInAppMessage(OSInAppMessage message) {
             }
         };
 
-        OneSignal.setIAMLifecycleHandler(handler);
+        OneSignal.setInAppMessageLifecycleHandler(handler);
 
         OneSignal.setLogLevel(OneSignal.LOG_LEVEL.VERBOSE, OneSignal.LOG_LEVEL.NONE);
 

OneSignalSDK/onesignal/src/main/java/com/onesignal/OSIAMLifecycleHandler.java renamed to OneSignalSDK/onesignal/src/main/java/com/onesignal/OSInAppMessageLifecycleHandler.java

@@ -27,17 +27,17 @@
 
 package com.onesignal;
 
-public abstract class OSIAMLifecycleHandler {
+public abstract class OSInAppMessageLifecycleHandler {
     public void onWillDisplayInAppMessage(OSInAppMessage message) {
-        OneSignal.Log(OneSignal.LOG_LEVEL.VERBOSE, "OSIAMLifecycleHandler: IAM Will Display: " + message.getMessageId());
+        OneSignal.Log(OneSignal.LOG_LEVEL.VERBOSE, "OSInAppMessageLifecycleHandler: IAM Will Display: " + message.getMessageId());
     }
     public void onDidDisplayInAppMessage(OSInAppMessage message) {
-        OneSignal.Log(OneSignal.LOG_LEVEL.VERBOSE, "OSIAMLifecycleHandler: IAM Did Display: " + message.getMessageId());
+        OneSignal.Log(OneSignal.LOG_LEVEL.VERBOSE, "OSInAppMessageLifecycleHandler: IAM Did Display: " + message.getMessageId());
     }
     public void onWillDismissInAppMessage(OSInAppMessage message) {
-        OneSignal.Log(OneSignal.LOG_LEVEL.VERBOSE, "OSIAMLifecycleHandler: IAM Will Dismiss: " + message.getMessageId());
+        OneSignal.Log(OneSignal.LOG_LEVEL.VERBOSE, "OSInAppMessageLifecycleHandler: IAM Will Dismiss: " + message.getMessageId());
     }
     public void onDidDismissInAppMessage(OSInAppMessage message) {
-        OneSignal.Log(OneSignal.LOG_LEVEL.VERBOSE, "OSIAMLifecycleHandler: IAM Did Dismiss: " + message.getMessageId());
+        OneSignal.Log(OneSignal.LOG_LEVEL.VERBOSE, "OSInAppMessageLifecycleHandler: IAM Did Dismiss: " + message.getMessageId());
     }
 }

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

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

OneSignalSDK/unittest/src/test/java/com/test/onesignal/InAppMessagingUnitTests.java

@@ -7,7 +7,7 @@
 
 import com.onesignal.InAppMessagingHelpers;
 import com.onesignal.MockOSTimeImpl;
-import com.onesignal.OSIAMLifecycleHandler;
+import com.onesignal.OSInAppMessageLifecycleHandler;
 import com.onesignal.OSInAppMessage;
 import com.onesignal.OSInAppMessageAction;
 import com.onesignal.OneSignal;
@@ -642,7 +642,7 @@ public void testOnPageChanged() throws Exception {
     private static int iamLifecycleCounter;
     @Test
     public void testIAMLifecycleEventsFlow() throws Exception {
-        OneSignal.setIAMLifecycleHandler(new OSIAMLifecycleHandler() {
+        OneSignal.setInAppMessageLifecycleHandler(new OSInAppMessageLifecycleHandler() {
             @Override
             public void onWillDisplayInAppMessage(OSInAppMessage message) {
                 lastMessage = message;