Merge pull request #1690 from bugsnag/PLAT-8379/session-lifecycle-fix…

…-sdk29 Only update session tracking after Activities have changed state
bugsnag · May 20, 2022 · fbdd4d4 · fbdd4d4
2 parents e72a724 + b02c087
commit fbdd4d4
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 6 deletions.
diff --git a/bugsnag-android-core/src/main/java/com/bugsnag/android/SessionLifecycleCallback.kt b/bugsnag-android-core/src/main/java/com/bugsnag/android/SessionLifecycleCallback.kt
@@ -2,17 +2,32 @@ package com.bugsnag.android
 
 import android.app.Activity
 import android.app.Application
+import android.os.Build
 import android.os.Bundle
 
 internal class SessionLifecycleCallback(
     private val sessionTracker: SessionTracker
 ) : Application.ActivityLifecycleCallbacks {
 
-    override fun onActivityStarted(activity: Activity) =
+    override fun onActivityStarted(activity: Activity) {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
+            sessionTracker.onActivityStarted(activity.javaClass.simpleName)
+        }
+    }
+
+    override fun onActivityPostStarted(activity: Activity) {
         sessionTracker.onActivityStarted(activity.javaClass.simpleName)
+    }
+
+    override fun onActivityStopped(activity: Activity) {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
+            sessionTracker.onActivityStopped(activity.javaClass.simpleName)
+        }
+    }
 
-    override fun onActivityStopped(activity: Activity) =
+    override fun onActivityPostStopped(activity: Activity) {
         sessionTracker.onActivityStopped(activity.javaClass.simpleName)
+    }
 
     override fun onActivityCreated(activity: Activity, savedInstanceState: Bundle?) {}
     override fun onActivityResumed(activity: Activity) {}

diff --git a/bugsnag-android-core/src/test/java/com/bugsnag/android/SessionLifecycleCallbackTest.kt b/bugsnag-android-core/src/test/java/com/bugsnag/android/SessionLifecycleCallbackTest.kt
@@ -31,9 +31,21 @@ internal class SessionLifecycleCallbackTest {
         verify(tracker, times(1)).onActivityStarted("Activity")
     }
 
+    @Test
+    fun onActivityPostStarted() {
+        callbacks.onActivityPostStarted(activity)
+        verify(tracker, times(1)).onActivityStarted("Activity")
+    }
+
     @Test
     fun onActivityStopped() {
         callbacks.onActivityStopped(activity)
         verify(tracker, times(1)).onActivityStopped("Activity")
     }
+
+    @Test
+    fun onActivityPostStopped() {
+        callbacks.onActivityPostStopped(activity)
+        verify(tracker, times(1)).onActivityStopped("Activity")
+    }
 }
diff --git a/...ugsnag/src/main/java/com/bugsnag/android/mazerunner/scenarios/CXXAutoContextScenario.java b/...ugsnag/src/main/java/com/bugsnag/android/mazerunner/scenarios/CXXAutoContextScenario.java
@@ -33,7 +33,7 @@ public void startScenario() {
     }
 
     @Override
-    public void onActivityStarted(@NonNull Activity activity) {
+    public void onActivityResumed(@NonNull Activity activity) {
         activate();
         Bugsnag.notify(generateException());
     }

diff --git a/...enarios/src/main/java/com/bugsnag/android/mazerunner/scenarios/CXXDelayedCrashScenario.kt b/...enarios/src/main/java/com/bugsnag/android/mazerunner/scenarios/CXXDelayedCrashScenario.kt
@@ -2,6 +2,8 @@ package com.bugsnag.android.mazerunner.scenarios
 
 import android.app.Activity
 import android.content.Context
+import android.os.Handler
+import android.os.Looper
 import com.bugsnag.android.Configuration
 import com.bugsnag.android.mazerunner.log
 
@@ -25,8 +27,9 @@ class CXXDelayedCrashScenario(
     }
 
     override fun onActivityStopped(activity: Activity) {
-        super.onActivityStopped(activity)
-        log("App sent to background, triggering crash.")
-        activate(405)
+        Handler(Looper.getMainLooper()).post {
+            log("App sent to background, triggering crash.")
+            activate(405)
+        }
     }
 }