Merge pull request #2259 from OneSignal/notification_click_not_foregrounded

Fix: Notification click not foreground the app in the first click if app is closed and no clickListener is added

Author: jinliu9508

OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/startup/IBootstrapService.kt

@@ -0,0 +1,31 @@
+package com.onesignal.core.internal.startup
+
+import com.onesignal.OneSignal
+import com.onesignal.core.internal.application.IApplicationService
+import com.onesignal.core.internal.config.ConfigModel
+import com.onesignal.core.internal.config.ConfigModelStore
+
+/**
+ * Implement and provide this interface as part of service registration to indicate the service
+ * wants to be instantiated and its [bootstrap] function called during the initialization process.
+ *
+ * When [IBootstrapService.bootstrap] is called, only [OneSignal.setAppId] have been called during
+ * [OneSignal.initWithContext].
+ *
+ * This means the following is true:
+ *
+ *  1) An appContext is available in [IApplicationService.appContext].
+ *  2) An appId is available in [ConfigModel.appId] via [ConfigModelStore.get]
+ *  3) None of the [IStartableService.start] is called
+ *
+ * When bootstrap there is no guarantee that any other data is available. Typically a bootstrap service
+ * must be instantiated immediately and will add their appropriate hooks to then respond to changes
+ * in the system.
+ */
+interface IBootstrapService {
+    /**
+     * Called when the service is to be bootstrap.  The appId and appContext have already been established.
+     */
+
+    fun bootstrap()
+}

OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/startup/IStartableService.kt

@@ -15,9 +15,8 @@ import com.onesignal.core.internal.config.ConfigModelStore
  *  1) An appContext is available in [IApplicationService.appContext].
  *  2) An appId is available in [ConfigModel.appId] via [ConfigModelStore.get]
  *
- * When started there is no guarantee that any other data is available.  Typically a startable service
- * must be instantiated immediately and will add their appropriate hooks to then respond to changes
- * in the system.
+ * When started there is no guarantee that any other data is available. Typically a startable service
+ * can asynchronously start some lengthy process that doesn't require immediate use.
  */
 interface IStartableService {
     /**
@@ -26,11 +25,3 @@ interface IStartableService {
      */
     fun start()
 }
-
-internal interface IBootstrapService {
-    /**
-     * Called when the service is to be started.  The appId and appContext have already been
-     * established.
-     */
-    fun bootstrap()
-}

OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/InAppMessagesModule.kt

@@ -3,6 +3,7 @@ package com.onesignal.inAppMessages
 import android.os.Build
 import com.onesignal.common.modules.IModule
 import com.onesignal.common.services.ServiceBuilder
+import com.onesignal.core.internal.startup.IBootstrapService
 import com.onesignal.core.internal.startup.IStartableService
 import com.onesignal.inAppMessages.internal.DummyInAppMessagesManager
 import com.onesignal.inAppMessages.internal.InAppMessagesManager
@@ -50,7 +51,7 @@ internal class InAppMessagesModule : IModule {
             builder.register<InAppDisplayer>().provides<IInAppDisplayer>()
 
             // Previews
-            builder.register<InAppMessagePreviewHandler>().provides<IStartableService>()
+            builder.register<InAppMessagePreviewHandler>().provides<IBootstrapService>()
 
             // Prompts
             builder.register<InAppMessagePromptFactory>().provides<IInAppMessagePromptFactory>()

OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/preview/InAppMessagePreviewHandler.kt

@@ -2,7 +2,7 @@ package com.onesignal.inAppMessages.internal.preview
 
 import android.app.Activity
 import com.onesignal.core.internal.application.IApplicationService
-import com.onesignal.core.internal.startup.IStartableService
+import com.onesignal.core.internal.startup.IBootstrapService
 import com.onesignal.core.internal.time.ITime
 import com.onesignal.inAppMessages.internal.display.IInAppDisplayer
 import com.onesignal.inAppMessages.internal.state.InAppStateService
@@ -25,8 +25,8 @@ internal class InAppMessagePreviewHandler(
     private val _notificationLifeCycle: INotificationLifecycleService,
     private val _state: InAppStateService,
     private val _time: ITime,
-) : IStartableService, INotificationLifecycleCallback {
-    override fun start() {
+) : IBootstrapService, INotificationLifecycleCallback {
+    override fun bootstrap() {
         _notificationLifeCycle.setInternalNotificationLifecycleCallback(this)
     }
 

OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/lifecycle/impl/NotificationLifecycleService.kt

@@ -87,7 +87,7 @@ internal class NotificationLifecycleService(
         activity: Activity,
         data: JSONObject,
     ): Boolean {
-        var canOpen = extOpenedCallback.hasSubscribers
+        var canOpen = true
         intLifecycleCallback.suspendingFire { canOpen = it.canOpenNotification(activity, data) }
         return canOpen
     }