From e051794bc6a0025044877301de3241b1bf7cbab8 Mon Sep 17 00:00:00 2001
From: fractalwrench <fractalwrench@gmail.com>
Date: Wed, 1 Dec 2021 11:27:37 +0000
Subject: [PATCH] fix: flush in memory session first

---
 CHANGELOG.md                                                 | 5 +++++
 .../src/main/java/com/bugsnag/android/SessionTracker.java    | 4 +---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cf896ea6c5..7d1e92e27e 100644
--- 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
index 343e6ee9cc..2a5e95c7f1 100644
--- 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;
     }