Fix IAM redisplay when no dismiss

* If user navigates with backpress while an IAM is being display, IAM should continue displaying until user dismiss it.
* Create new scenario for displaying IAM again when changing activity

Author: Jeasmine

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

@@ -49,7 +49,7 @@ abstract static class ActivityAvailableListener {
         void available(@NonNull Activity activity) {
         }
 
-        void stopped() {
+        void stopped(@NonNull Activity activity) {
         }
 
         void lostFocus() {
@@ -67,11 +67,11 @@ void lostFocus() {
     private Activity curActivity = null;
     private boolean nextResumeIsFirstActivity = false;
 
-    void onConfigurationChanged(Configuration newConfig) {
+    void onConfigurationChanged(Configuration newConfig, Activity activity) {
         // If Activity contains the configChanges orientation flag, re-create the view this way
         if (curActivity != null && OSUtils.hasConfigChangeFlag(curActivity, ActivityInfo.CONFIG_ORIENTATION)) {
-            logOrientationChange(newConfig.orientation);
-            onOrientationChanged();
+            logOrientationChange(newConfig.orientation, activity);
+            onOrientationChanged(activity);
         }
     }
 
@@ -107,7 +107,7 @@ void onActivityStopped(Activity activity) {
         }
 
         for (Map.Entry<String, ActivityAvailableListener> entry : sActivityAvailableListeners.entrySet()) {
-            entry.getValue().stopped();
+            entry.getValue().stopped(activity);
         }
 
         logCurActivity();
@@ -129,12 +129,12 @@ private void logCurActivity() {
         OneSignal.Log(OneSignal.LOG_LEVEL.DEBUG, "curActivity is NOW: " + (curActivity != null ? "" + curActivity.getClass().getName() + ":" + curActivity : "null"));
     }
 
-    private void logOrientationChange(int orientation) {
+    private void logOrientationChange(int orientation, Activity activity) {
         // Log device orientation change
         if (orientation == Configuration.ORIENTATION_LANDSCAPE)
-            OneSignal.onesignalLog(OneSignal.LOG_LEVEL.DEBUG, "Configuration Orientation Change: LANDSCAPE (" + orientation + ")");
+            OneSignal.onesignalLog(OneSignal.LOG_LEVEL.DEBUG, "Configuration Orientation Change: LANDSCAPE (" + orientation + ") on activity: " + activity);
         else if (orientation == Configuration.ORIENTATION_PORTRAIT)
-            OneSignal.onesignalLog(OneSignal.LOG_LEVEL.DEBUG, "Configuration Orientation Change: PORTRAIT (" + orientation + ")");
+            OneSignal.onesignalLog(OneSignal.LOG_LEVEL.DEBUG, "Configuration Orientation Change: PORTRAIT (" + orientation + ") on activity: " + activity);
     }
 
     /**
@@ -143,11 +143,11 @@ else if (orientation == Configuration.ORIENTATION_PORTRAIT)
      * This fix was originally implemented for In App Messages not being re-shown when orientation
      * was changed on wrapper SDK apps
      */
-    private void onOrientationChanged() {
+    private void onOrientationChanged(Activity activity) {
         // Remove view
         handleLostFocus();
         for (Map.Entry<String, ActivityAvailableListener> entry : sActivityAvailableListeners.entrySet()) {
-            entry.getValue().stopped();
+            entry.getValue().stopped(activity);
         }
 
         // Show view

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

@@ -61,7 +61,7 @@ static void registerActivityLifecycleCallbacks(@NonNull final Application applic
          configuration = new ComponentCallbacks() {
             @Override
             public void onConfigurationChanged(Configuration newConfig) {
-               activityLifecycleHandler.onConfigurationChanged(newConfig);
+               activityLifecycleHandler.onConfigurationChanged(newConfig, activityLifecycleHandler.getCurActivity());
             }
 
             @Override

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

@@ -18,7 +18,6 @@
 import org.json.JSONObject;
 
 import java.io.UnsupportedEncodingException;
-import java.lang.ref.WeakReference;
 
 import static com.onesignal.OSViewUtils.dpToPx;
 
@@ -64,7 +63,8 @@ boolean isBanner() {
     @NonNull private Activity activity;
     @NonNull private OSInAppMessage message;
 
-    private boolean firstShow = true;
+    private String currentActivityName = null;
+    private Integer lastPageHeight = null;
 
     interface OneSignalGenericCallback {
         void onComplete();
@@ -275,40 +275,49 @@ private void calculateHeightAndShowWebViewAfterNewActivity() {
 
         OneSignal.Log(OneSignal.LOG_LEVEL.DEBUG, "In app message new activity, calculate height and show ");
 
-       // Using post to ensure that the status bar inset is already added to the view
-       OSViewUtils.decorViewReady(activity, new Runnable() {
-          @Override
-          public void run() {
-             // At time point the webView isn't attached to a view
-             // Set the WebView to the max screen size then run JS to evaluate the height.
-             setWebViewToMaxSize(activity);
-             webView.evaluateJavascript(OSJavaScriptInterface.GET_PAGE_META_DATA_JS_FUNCTION, new ValueCallback<String>() {
-                 @Override
-                 public void onReceiveValue(final String value) {
-                    try {
-                       int pagePxHeight = pageRectToViewHeight(activity, new JSONObject(value));
-                       showMessageView(pagePxHeight);
-                    } catch (JSONException e) {
-                       e.printStackTrace();
+        // Using post to ensure that the status bar inset is already added to the view
+        OSViewUtils.decorViewReady(activity, new Runnable() {
+            @Override
+            public void run() {
+                // At time point the webView isn't attached to a view
+                // Set the WebView to the max screen size then run JS to evaluate the height.
+                setWebViewToMaxSize(activity);
+                webView.evaluateJavascript(OSJavaScriptInterface.GET_PAGE_META_DATA_JS_FUNCTION, new ValueCallback<String>() {
+                    @Override
+                    public void onReceiveValue(final String value) {
+                        try {
+                            int pagePxHeight = pageRectToViewHeight(activity, new JSONObject(value));
+                            showMessageView(pagePxHeight);
+                        } catch (JSONException e) {
+                            e.printStackTrace();
+                        }
                     }
-                 }
-             });
-          }
+                });
+            }
        });
     }
 
     @Override
     void available(final @NonNull Activity activity) {
+        String lastActivityName = this.currentActivityName;
         this.activity = activity;
-        if (firstShow)
+        this.currentActivityName = activity.getLocalClassName();
+
+        if (lastActivityName == null)
             showMessageView(null);
-        else
+        else if (!lastActivityName.equals(currentActivityName)) {
+            // Navigate to new activity while displaying current IAM
+            if (messageView != null)
+                messageView.removeAllViews();
+            showMessageView(lastPageHeight);
+        } else
             calculateHeightAndShowWebViewAfterNewActivity();
     }
 
     @Override
-    void stopped() {
-        if (messageView != null)
+    void stopped(Activity activity) {
+        OneSignal.Log(OneSignal.LOG_LEVEL.DEBUG, "In app message activity stopped, cleaning views");
+        if (messageView != null && currentActivityName.equals(activity.getLocalClassName()))
             messageView.removeAllViews();
     }
 
@@ -327,8 +336,10 @@ private void showMessageView(@Nullable Integer newHeight) {
 
         OneSignal.Log(OneSignal.LOG_LEVEL.DEBUG, "In app message, showing first one with height: " + newHeight);
         messageView.setWebView(webView);
-        if (newHeight != null)
+        if (newHeight != null) {
+            lastPageHeight = newHeight;
             messageView.updateHeight(newHeight);
+        }
         messageView.showView(activity);
         messageView.checkIfShouldDismiss();
     }
@@ -377,11 +388,11 @@ private void setWebViewToMaxSize(Activity activity) {
     }
 
     private void createNewInAppMessageView(@NonNull Position displayLocation, int pageHeight, boolean dragToDismissDisabled) {
+        lastPageHeight = pageHeight;
         messageView = new InAppMessageView(webView, displayLocation, pageHeight, message.getDisplayDuration(), dragToDismissDisabled);
         messageView.setMessageController(new InAppMessageView.InAppMessageViewListener() {
             @Override
             public void onMessageWasShown() {
-                firstShow = false;
                 OneSignal.getInAppMessageController().onMessageWasShown(message);
             }