address review comments

* Still send likely erroneous session time. This way the server can be aware of any issues. * Simplify state when firing subscribers of the Application Service
OneSignal · Jun 12, 2024 · 32fec1b · 32fec1b
1 parent 5aa61f7
commit 32fec1b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/...nal/core/src/main/java/com/onesignal/core/internal/application/impl/ApplicationService.kt b/...nal/core/src/main/java/com/onesignal/core/internal/application/impl/ApplicationService.kt
@@ -30,7 +30,6 @@ class ApplicationService() : IApplicationService, ActivityLifecycleCallbacks, On
     private val activityLifecycleNotifier = EventProducer<IActivityLifecycleHandler>()
     private val applicationLifecycleNotifier = EventProducer<IApplicationLifecycleHandler>()
     private val systemConditionNotifier = EventProducer<ISystemConditionHandler>()
-    private var shouldFireOnFocusOnSubscribing = false
 
     override val isInForeground: Boolean
         get() = entryState.isAppOpen || entryState.isNotificationClick
@@ -73,7 +72,6 @@ class ApplicationService() : IApplicationService, ActivityLifecycleCallbacks, On
 
     /**
      * Call to "start" this service, expected to be called during initialization of the SDK.
-     * Detects if this service should fire subscribers' onFocus() callbacks immediately on subscribing.
      *
      * @param context The context the SDK has been initialized under.
      */
@@ -112,8 +110,6 @@ class ApplicationService() : IApplicationService, ActivityLifecycleCallbacks, On
                 activityReferences = 1
                 nextResumeIsFirstActivity = false
             }
-            // Once listeners subscribe, fire their callbacks
-            shouldFireOnFocusOnSubscribing = true
         } else {
             nextResumeIsFirstActivity = true
             entryState = AppEntryAction.APP_CLOSE
@@ -124,7 +120,9 @@ class ApplicationService() : IApplicationService, ActivityLifecycleCallbacks, On
 
     override fun addApplicationLifecycleHandler(handler: IApplicationLifecycleHandler) {
         applicationLifecycleNotifier.subscribe(handler)
-        if (shouldFireOnFocusOnSubscribing) {
+        if (current != null) {
+            // When a listener subscribes, fire its callback
+            // The listener is too late to receive the earlier onFocus call
             handler.onFocus(true)
         }
     }

diff --git a/...esignal/core/src/main/java/com/onesignal/session/internal/session/impl/SessionListener.kt b/...esignal/core/src/main/java/com/onesignal/session/internal/session/impl/SessionListener.kt
@@ -48,9 +48,9 @@ internal class SessionListener(
     override fun onSessionEnded(duration: Long) {
         val durationInSeconds = duration / 1000
 
-        // Time is invalid if below 1 second or over a day
+        // Time is erroneous if below 1 second or over a day
         if (durationInSeconds < 1L || durationInSeconds > SECONDS_IN_A_DAY) {
-            return
+            Logging.error("SessionListener.onSessionEnded sending duration of $durationInSeconds seconds")
         }
 
         _operationRepo.enqueue(