Merge pull request #1538 from bugsnag/PLAT-7524/flush-in-memory-session

Flush in memory session first
bugsnag · Dec 1, 2021 · d85d6a8 · d85d6a8
2 parents 64fdd05 + e051794
commit d85d6a8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,11 @@
 * Bump compileSdkVersion to apiLevel 31
   [#1536](https://github.com/bugsnag/bugsnag-android/pull/1536)
 
+### Bug fixes
+
+* Flush in-memory sessions first
+  [#1538](https://github.com/bugsnag/bugsnag-android/pull/1538)
+
 ## 5.16.0 (2021-11-29)
 
 ### Bug fixes

diff --git a/bugsnag-android-core/src/main/java/com/bugsnag/android/SessionTracker.java b/bugsnag-android-core/src/main/java/com/bugsnag/android/SessionTracker.java
@@ -181,12 +181,10 @@ private boolean trackSessionIfNeeded(final Session session) {
         if (deliverSession && session.isTracked().compareAndSet(false, true)) {
             currentSession = session;
             notifySessionStartObserver(session);
-            flushAsync();
             flushInMemorySession(session);
-
+            flushAsync();
             return true;
         }
-
         return false;
     }