From 82b8236c42099b68920fff1f353cab34d85f1f86 Mon Sep 17 00:00:00 2001
From: fractalwrench <fractalwrench@gmail.com>
Date: Fri, 10 Jul 2020 10:02:56 +0100
Subject: [PATCH 1/2] fix: ensure plugins are loaded before flushing errors

---
 .../src/main/java/com/bugsnag/android/Client.java      | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/bugsnag-android-core/src/main/java/com/bugsnag/android/Client.java b/bugsnag-android-core/src/main/java/com/bugsnag/android/Client.java
index dc65a61eb2..7664c4fa7d 100644
--- a/bugsnag-android-core/src/main/java/com/bugsnag/android/Client.java
+++ b/bugsnag-android-core/src/main/java/com/bugsnag/android/Client.java
@@ -234,17 +234,19 @@ public void run() {
         } else {
             this.systemBroadcastReceiver = null;
         }
-        connectivity.registerForNetworkChanges();
 
         registerOrientationChangeListener();
 
+        // initialise plugins before attempting to flush any errors
+        loadPlugins(configuration);
+
         // Flush any on-disk errors
         eventStore.flushOnLaunch();
+        connectivity.registerForNetworkChanges();
+
+        // leave auto breadcrumb
         Map<String, Object> data = Collections.emptyMap();
         leaveAutoBreadcrumb("Bugsnag loaded", BreadcrumbType.STATE, data);
-
-        // finally, initialise plugins
-        loadPlugins(configuration);
     }
 
     @VisibleForTesting

From 03f0c1e65f09b153094f759c49306d533572d80a Mon Sep 17 00:00:00 2001
From: fractalwrench <fractalwrench@gmail.com>
Date: Fri, 10 Jul 2020 14:28:23 +0100
Subject: [PATCH 2/2] address review feedback

---
 .../src/main/java/com/bugsnag/android/Client.java               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bugsnag-android-core/src/main/java/com/bugsnag/android/Client.java b/bugsnag-android-core/src/main/java/com/bugsnag/android/Client.java
index 7664c4fa7d..2f5b2fe7c8 100644
--- a/bugsnag-android-core/src/main/java/com/bugsnag/android/Client.java
+++ b/bugsnag-android-core/src/main/java/com/bugsnag/android/Client.java
@@ -241,8 +241,8 @@ public void run() {
         loadPlugins(configuration);
 
         // Flush any on-disk errors
-        eventStore.flushOnLaunch();
         connectivity.registerForNetworkChanges();
+        eventStore.flushOnLaunch();
 
         // leave auto breadcrumb
         Map<String, Object> data = Collections.emptyMap();