Merge pull request #1445 from OneSignal/fix/IAM-not-persisting-after-backgrounding

Remove `messageWasDismissedByBackPress` and `lostFocus` to redisplay IAM after backgrounding app

Author: nan-li

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

@@ -276,9 +276,6 @@ static class AppFocusRunnable implements Runnable {
         public void run() {
             OneSignal.onesignalLog(OneSignal.LOG_LEVEL.DEBUG, "ActivityLifecycleHandler running AppFocusRunnable");
             backgrounded = true;
-            for (Map.Entry<String, ActivityAvailableListener> entry : sActivityAvailableListeners.entrySet()) {
-                entry.getValue().lostFocus();
-            }
             OneSignal.onAppLostFocus();
             completed = true;
         }

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

@@ -688,12 +688,6 @@ void messageWasDismissed(@NonNull OSInAppMessageInternal message, boolean failed
         dismissCurrentMessage(message);
     }
 
-    void messageWasDismissedByBackPress(@NonNull OSInAppMessageInternal message) {
-        logger.debug("In app message OSInAppMessageController messageWasDismissed by back press: " + message.toString());
-        // IAM was not dismissed by user, will be redisplay again until user dismiss it
-        dismissCurrentMessage(message);
-    }
-
     private boolean shouldWaitForPromptsBeforeDismiss() {
         return currentPrompt != null;
     }

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

@@ -344,13 +344,6 @@ void stopped(@NonNull Activity activity) {
             messageView.removeAllViews();
     }
 
-    @Override
-    void lostFocus() {
-        OneSignal.getInAppMessageController().messageWasDismissedByBackPress(message);
-        removeActivityListener();
-        setMessageView(null);
-    }
-
     private void showMessageView(@Nullable Integer newHeight) {
         synchronized (messageViewSyncLock) {
             if (messageView == null) {

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

@@ -605,14 +605,14 @@ public void doNotReshowInAppIfDismissed_evenAfterColdRestart() throws Exception
     }
 
     @Test
-    public void doNotReshowInAppUntilTriggerIfAppBackPressed() throws Exception {
+    public void testReshowInAppMessageIfAppBackgrounded() throws Exception {
         // 1. Start app
         initializeSdkWithMultiplePendingMessages();
         // 2. Trigger showing In App and dismiss it
         OneSignal.addTrigger("test_2", 2);
         assertEquals(1, OneSignalPackagePrivateHelper.getInAppMessageDisplayQueue().size());
         assertTrue(OneSignalPackagePrivateHelper.isInAppMessageShowing());
-        // 3. Emulate back pressing
+        // 3. Emulate backgrounding app
         pauseActivity(blankActivityController);
         blankActivityController.destroy();
         threadAndTaskWait();
@@ -621,7 +621,7 @@ public void doNotReshowInAppUntilTriggerIfAppBackPressed() throws Exception {
         OneSignalInit();
         threadAndTaskWait();
         assertEquals(1, OneSignalPackagePrivateHelper.getInAppMessageDisplayQueue().size());
-        assertFalse(OneSignalPackagePrivateHelper.isInAppMessageShowing());
+        assertTrue(OneSignalPackagePrivateHelper.isInAppMessageShowing());
     }
 
     @Test