fix(launch): change the launch timeout calculation for synchronous de…

…livery to handle cases where the app start has completed before Bugsnag.start is called

CHANGELOG.md

@@ -11,6 +11,7 @@
 
 * Sending startup crashes synchronously now uses a flexible timeout so that apps with slower startups don't ANR
   [#2075](https://github.com/bugsnag/bugsnag-android/pull/2075)
+  [#2080](https://github.com/bugsnag/bugsnag-android/pull/2080)
 
 ## 6.7.0 (2024-08-08)
 

bugsnag-android-core/src/main/java/com/bugsnag/android/EventStore.kt

@@ -65,16 +65,16 @@ internal class EventStore(
             // have blocked the main thread before this code is reached.
             val currentStartupDuration =
                 SystemClock.elapsedRealtime() - ForegroundDetector.startupTime
-            val timeout = LAUNCH_CRASH_TIMEOUT_MS - currentStartupDuration
+            var timeout = LAUNCH_CRASH_TIMEOUT_MS - currentStartupDuration
 
-            if (timeout > 0) {
-                future.get(timeout, TimeUnit.MILLISECONDS)
-            } else {
-                logger.d(
-                    "Startup delivery timeout has been exceeded, " +
-                        "launch crashes will be delivered asynchronously"
-                )
+            if (timeout <= 0) {
+                // if Bugsnag.start is called too long after Application.onCreate is expected to
+                // have returned, we use a full LAUNCH_CRASH_TIMEOUT_MS instead of a calculated one
+                // assuming that the app is already fully started
+                timeout = LAUNCH_CRASH_TIMEOUT_MS
             }
+
+            future.get(timeout, TimeUnit.MILLISECONDS)
         } catch (exc: InterruptedException) {
             logger.d("Failed to send launch crash reports within timeout, continuing.", exc)
         } catch (exc: ExecutionException) {