Fix Permission observer not being called

* When the user swaps from the app to the setting and enables/disable notification fast enough no avoid onLostFocus runnable, the permission observer was not being fired
* Add new lifecycle event tracking, onStart, and onStop
* Check permission under on Start

Author: Jeasmine

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

@@ -85,6 +85,7 @@ void onActivityCreated(Activity activity) {
     }
 
     void onActivityStarted(Activity activity) {
+        focusHandler.startOnStartFocusWork();
     }
 
     void onActivityResumed(Activity activity) {
@@ -106,6 +107,7 @@ void onActivityPaused(Activity activity) {
 
     void onActivityStopped(Activity activity) {
         OneSignal.Log(OneSignal.LOG_LEVEL.DEBUG, "onActivityStopped: " + activity);
+        focusHandler.startOnStopFocusWork();
 
         if (activity == curActivity) {
             curActivity = null;
@@ -184,8 +186,7 @@ private void handleFocus() {
         if (focusHandler.hasBackgrounded() || nextResumeIsFirstActivity) {
             OneSignal.onesignalLog(OneSignal.LOG_LEVEL.DEBUG, "ActivityLifecycleHandler reset background state, call app focus");
             nextResumeIsFirstActivity = false;
-            focusHandler.resetBackgroundState();
-            OneSignal.onAppFocus();
+            focusHandler.startOnFocusWork();
         } else {
             OneSignal.onesignalLog(OneSignal.LOG_LEVEL.DEBUG, "ActivityLifecycleHandler cancel background lost focus worker");
             focusHandler.cancelOnLostFocusWorker(FOCUS_LOST_WORKER_TAG, OneSignal.appContext);

OneSignalSDK/onesignal/src/main/java/com/onesignal/OSFocusHandler.kt

@@ -28,17 +28,38 @@
 package com.onesignal
 
 import android.content.Context
+import android.os.Handler
 import androidx.work.*
 import java.util.concurrent.TimeUnit
 
 class OSFocusHandler {
 
+    private var stopRunnable: Runnable? = null
+
     fun hasBackgrounded() = backgrounded
 
     fun hasCompleted() = completed
 
-    fun resetBackgroundState() {
-        backgrounded = false
+    fun startOnFocusWork() {
+        resetBackgroundState()
+        OneSignal.onAppFocus()
+    }
+
+    fun startOnStartFocusWork() {
+        if (stopped) {
+            stopped = false
+            OSTimeoutHandler.getTimeoutHandler().destroyTimeout(stopRunnable)
+            stopRunnable = null
+            OneSignal.onAppStartFocusLogic()
+        }
+    }
+
+    fun startOnStopFocusWork() {
+        stopRunnable = Runnable {
+            stopped = true
+        }.also {
+            OSTimeoutHandler.getTimeoutHandler().startTimeout(stopDelay, it)
+        }
     }
 
     fun startOnLostFocusWorker(tag: String, delay: Long, context: Context)  {
@@ -60,6 +81,10 @@ class OSFocusHandler {
         WorkManager.getInstance(context).cancelAllWorkByTag(tag)
     }
 
+    private fun resetBackgroundState() {
+        backgrounded = false
+    }
+
     private fun buildConstraints(): Constraints {
         return Constraints.Builder()
             .setRequiredNetworkType(NetworkType.CONNECTED)
@@ -75,6 +100,8 @@ class OSFocusHandler {
     }
 
     companion object {
+        private const val stopDelay = 1500L
+        private var stopped = false
         private var backgrounded = false
         private var completed = false
 

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

@@ -1296,7 +1296,7 @@ static void logHttpError(String errorString, int statusCode, Throwable throwable
       Log(LOG_LEVEL.WARN, "HTTP code: " + statusCode + " " + errorString + jsonError, throwable);
    }
 
-   // Returns true if there is active time that is unsynced.
+   // Returns true if there is active time that is non synced.
    @WorkerThread
    static void onAppLostFocus() {
       Log(LOG_LEVEL.DEBUG, "Application lost focus initDone: " + initDone);
@@ -1375,6 +1375,10 @@ static void onAppFocus() {
       onAppFocusLogic();
    }
 
+   static void onAppStartFocusLogic() {
+      getCurrentPermissionState(appContext).refreshAsTo();
+   }
+
    private static void onAppFocusLogic() {
       // Make sure without privacy consent, onAppFocus returns early
       if (shouldLogUserPrivacyConsentErrorMessageForMethodName("onAppFocus"))

OneSignalSDK/unittest/src/test/java/com/onesignal/ShadowFocusHandler.kt

@@ -35,11 +35,32 @@ import android.content.Context
 import com.onesignal.OSFocusHandler.Companion.onLostFocusDoWork
 import org.robolectric.annotation.Implementation
 import org.robolectric.annotation.Implements
+import org.robolectric.annotation.RealObject
 
 @Implements(OSFocusHandler::class)
 class ShadowFocusHandler {
+
+    @Implementation
+    fun startOnStartFocusWork() {
+        hasStopped = false
+        OneSignal.onAppStartFocusLogic()
+    }
+
+    @Implementation
+    fun startOnStopFocusWork() {
+        hasStopped = true
+    }
+
     @Implementation
     fun startOnLostFocusWorker(tag: String, delay: Long, context: Context) {
         onLostFocusDoWork()
     }
+
+    companion object {
+        var hasStopped = false
+
+        fun resetStatics() {
+            hasStopped = false
+        }
+    }
 }

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

@@ -163,6 +163,7 @@
 import static com.test.onesignal.TestHelpers.pauseActivity;
 import static com.test.onesignal.TestHelpers.restartAppAndElapseTimeToNextSession;
 import static com.test.onesignal.TestHelpers.startRemoteNotificationReceivedHandlerService;
+import static com.test.onesignal.TestHelpers.stopActivity;
 import static com.test.onesignal.TestHelpers.threadAndTaskWait;
 import static junit.framework.Assert.assertEquals;
 import static junit.framework.Assert.assertFalse;
@@ -686,6 +687,20 @@ public void testAppTwiceOnFocusNeededAfterOnSessionCallFail() throws Exception {
       assertRestCalls(4);
    }
 
+   @Test
+   public void testAppStartFocus() throws Exception {
+      OneSignalInit();
+      threadAndTaskWait();
+
+      assertTrue(ShadowOneSignalRestClient.lastUrl.matches("players"));
+
+      stopActivity(blankActivityController);
+      assertTrue(ShadowFocusHandler.Companion.getHasStopped());
+
+      blankActivityController.resume();
+      assertFalse(ShadowFocusHandler.Companion.getHasStopped());
+   }
+
    private void setOneSignalContextOpenAppThenBackgroundAndResume() throws Exception {
       // 1. Context could be set by the app like this; Or on it's own when a push or other event happens
       OneSignal.initWithContext(blankActivity.getApplication());
@@ -3196,22 +3211,18 @@ public void shouldFirePermissionObserverWhenUserDisablesNotifications() throws E
       OneSignalInit();
       threadAndTaskWait();
 
-      OSPermissionObserver permissionObserver = new OSPermissionObserver() {
-         @Override
-         public void onOSPermissionChanged(OSPermissionStateChanges stateChanges) {
-            lastPermissionStateChanges = stateChanges;
-            currentPermission = stateChanges.getTo().areNotificationsEnabled();
-         }
+      OSPermissionObserver permissionObserver = stateChanges -> {
+         lastPermissionStateChanges = stateChanges;
+         currentPermission = stateChanges.getTo().areNotificationsEnabled();
       };
       OneSignal.addPermissionObserver(permissionObserver);
       lastPermissionStateChanges = null;
       // Make sure garbage collection doesn't nuke any observers.
       Runtime.getRuntime().gc();
 
-      pauseActivity(blankActivityController);
+      stopActivity(blankActivityController);
       ShadowNotificationManagerCompat.enabled = false;
       blankActivityController.resume();
-      threadAndTaskWait();
 
       assertTrue(lastPermissionStateChanges.getFrom().areNotificationsEnabled());
       assertFalse(lastPermissionStateChanges.getTo().areNotificationsEnabled());

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

@@ -29,6 +29,7 @@
 import com.onesignal.ShadowDynamicTimer;
 import com.onesignal.ShadowFCMBroadcastReceiver;
 import com.onesignal.ShadowFirebaseAnalytics;
+import com.onesignal.ShadowFocusHandler;
 import com.onesignal.ShadowFusedLocationApiWrapper;
 import com.onesignal.ShadowGenerateNotification;
 import com.onesignal.ShadowGoogleApiClientCompatProxy;
@@ -129,6 +130,7 @@ static void beforeTestInitAndCleanup() throws Exception {
       ShadowNotificationReceivedEvent.resetStatics();
       ShadowOneSignalNotificationManager.resetStatics();
       ShadowBadgeCountUpdater.resetStatics();
+      ShadowFocusHandler.Companion.resetStatics();
 
       lastException = null;
    }
@@ -588,6 +590,11 @@ public static void pauseActivity(ActivityController activityController) throws E
       threadAndTaskWait();
    }
 
+   public static void stopActivity(ActivityController activityController) throws Exception {
+      activityController.stop();
+      threadAndTaskWait();
+   }
+
    public static void assertAndRunSyncService() throws Exception {
       // There should be a SyncJobService service scheduled
       assertNumberOfServicesAvailable(1);