fix: Cancel crash reports after flushing startup crashes

Internally FileStore retains a Collection of files which have previously been found for a request,
to prevent duplicate reports being sent. This puts the onus on the calling code to cancel or delete
the files once the request has been completed. This change ensures that the storedFiles are only
requested once, then filtered for crashes on launch, and then all files are cancelled after a
reasonable amount of time has passed regardless of delivery, which reset the internal FileStore
state. flushAsync is then called which will flush any remaining reports that have not yet been
delivered

sdk/src/main/java/com/bugsnag/android/ErrorStore.java

@@ -51,11 +51,10 @@ public int compare(File lhs, File rhs) {
     }
 
     void flushOnLaunch() {
-        final List<File> crashReports = findLaunchCrashReports();
+        List<File> storedFiles = findStoredFiles();
+        final List<File> crashReports = findLaunchCrashReports(storedFiles);
 
-        if (crashReports.isEmpty() || config.getLaunchCrashThresholdMs() == 0) {
-            flushAsync(); // if disabled or no startup crash, flush async
-        } else {
+        if (!crashReports.isEmpty() && config.getLaunchCrashThresholdMs() != 0) {
 
             // Block the main thread for a 2 second interval as the app may crash very soon.
             // The request itself will run in a background thread and will continue after the 2
@@ -83,6 +82,9 @@ public void run() {
             }
             Logger.info("Continuing with Bugsnag initialisation");
         }
+
+        cancelQueuedFiles(storedFiles); // cancel all previously found files
+        flushAsync(); // flush any remaining errors async that weren't delivered
     }
 
     /**
@@ -130,7 +132,7 @@ private void flushErrorReport(File errorFile) {
         } catch (DeliveryFailureException exception) {
             cancelQueuedFiles(Collections.singleton(errorFile));
             Logger.warn("Could not send previously saved error(s)"
-                        + " to Bugsnag, will try again later", exception);
+                + " to Bugsnag, will try again later", exception);
         } catch (Exception exception) {
             deleteStoredFiles(Collections.singleton(errorFile));
             Logger.warn("Problem sending unsent error from disk", exception);
@@ -141,8 +143,7 @@ boolean isLaunchCrashReport(File file) {
         return file.getName().endsWith("_startupcrash.json");
     }
 
-    private List<File> findLaunchCrashReports() {
-        Collection<File> storedFiles = findStoredFiles();
+    private List<File> findLaunchCrashReports(Collection<File> storedFiles) {
         List<File> launchCrashes = new ArrayList<>();
 
         for (File file : storedFiles) {