Use a waiter with a lifecycle listener to change the polling period

OneSignal · Jun 10, 2024 · 3822030 · 3822030
1 parent 3fda347
commit 3822030
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 7 deletions.
diff --git a/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/config/ConfigModel.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/config/ConfigModel.kt
@@ -199,12 +199,21 @@ class ConfigModel : Model() {
         }
 
     /**
-     * The number of milliseconds between fetching the current notification permission value
+     * The number of milliseconds between fetching the current notification permission value when the app is in focus
      */
-    var fetchNotificationPermissionInterval: Long
-        get() = getLongProperty(::fetchNotificationPermissionInterval.name) { 1_000 }
+    var foregroundFetchNotificationPermissionInterval: Long
+        get() = getLongProperty(::foregroundFetchNotificationPermissionInterval.name) { 1_000 }
         set(value) {
-            setLongProperty(::fetchNotificationPermissionInterval.name, value)
+            setLongProperty(::foregroundFetchNotificationPermissionInterval.name, value)
+        }
+
+    /**
+     * The number of milliseconds between fetching the current notification permission value when the app is out of focus
+     */
+    var backgroundFetchNotificationPermissionInterval: Long
+        get() = getLongProperty(::backgroundFetchNotificationPermissionInterval.name) { 1_800_000 }
+        set(value) {
+            setLongProperty(::backgroundFetchNotificationPermissionInterval.name, value)
         }
 
     /**

diff --git a/...com/onesignal/notifications/internal/permissions/impl/NotificationPermissionController.kt b/...com/onesignal/notifications/internal/permissions/impl/NotificationPermissionController.kt
@@ -45,9 +45,9 @@ import com.onesignal.notifications.internal.common.NotificationHelper
 import com.onesignal.notifications.internal.permissions.INotificationPermissionChangedHandler
 import com.onesignal.notifications.internal.permissions.INotificationPermissionController
 import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.newSingleThreadContext
+import kotlinx.coroutines.withTimeoutOrNull
 import kotlinx.coroutines.yield
 
 internal class NotificationPermissionController(
@@ -59,6 +59,8 @@ internal class NotificationPermissionController(
 ) : IRequestPermissionService.PermissionCallback,
     INotificationPermissionController {
     private val waiter = WaiterWithValue<Boolean>()
+    private val pollingWaiter = WaiterWithValue<Boolean>()
+    private var pollingWaitInterval: Long
     private val events = EventProducer<INotificationPermissionChangedHandler>()
     private var enabled: Boolean
     private val coroutineScope = CoroutineScope(newSingleThreadContext(name = "NotificationPermissionController"))
@@ -74,20 +76,40 @@ internal class NotificationPermissionController(
     init {
         this.enabled = notificationsEnabled()
         _requestPermission.registerAsCallback(PERMISSION_TYPE, this)
+        pollingWaitInterval = _configModelStore.model.foregroundFetchNotificationPermissionInterval
+        registerPollingLifecycleListener()
         coroutineScope.launch {
             pollForPermission()
         }
     }
 
+    private fun registerPollingLifecycleListener() {
+        _applicationService.addApplicationLifecycleHandler(
+            object : ApplicationLifecycleHandlerBase() {
+                override fun onFocus() {
+                    super.onFocus()
+                    pollingWaitInterval = _configModelStore.model.foregroundFetchNotificationPermissionInterval
+                    pollingWaiter.wake(true)
+                }
+
+                override fun onUnfocused() {
+                    super.onUnfocused()
+                    pollingWaitInterval = _configModelStore.model.backgroundFetchNotificationPermissionInterval
+                }
+            },
+        )
+    }
+
     private suspend fun pollForPermission() {
         while (true) {
             val enabled = this.notificationsEnabled()
             if (this.enabled != enabled) { // If the permission has changed without prompting through OneSignal
                 this.enabled = enabled
                 events.fire { it.onNotificationPermissionChanged(enabled) }
             }
-            // change to use waiter and account for background/foreground
-            delay(_configModelStore.model.fetchNotificationPermissionInterval)
+            withTimeoutOrNull(pollingWaitInterval) {
+                pollingWaiter.waitForWake()
+            }
         }
     }