refactor: null check for deleting stored files

provide a null check in the unlikely case the collection param is null
bugsnag · Apr 26, 2018 · a1f574f · a1f574f
1 parent 761cb3d
commit a1f574f
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/sdk/src/androidTest/java/com/bugsnag/android/ErrorStoreTest.java b/sdk/src/androidTest/java/com/bugsnag/android/ErrorStoreTest.java
@@ -169,6 +169,13 @@ public void testDeleteQueuedFiles() {
         writeErrorToStore();
         assertEquals(1, errorStore.findStoredFiles().size());
 
+        errorStore.deleteStoredFiles(null);
+        assertEquals(1, errorStore.queuedFiles.size());
+
+        errorStore.deleteStoredFiles(Collections.<File>emptyList());
+        assertEquals(1, errorStore.queuedFiles.size());
+
+
         errorStore.deleteStoredFiles(errorStore.findStoredFiles());
         assertEquals(0, errorStore.findStoredFiles().size());
         assertEquals(0, errorStore.queuedFiles.size());

diff --git a/sdk/src/main/java/com/bugsnag/android/FileStore.java b/sdk/src/main/java/com/bugsnag/android/FileStore.java
@@ -145,11 +145,13 @@ void cancelQueuedFiles(Collection<File> files) {
     void deleteStoredFiles(Collection<File> storedFiles) {
         lock.lock();
         try {
-            queuedFiles.removeAll(storedFiles);
+            if (storedFiles != null) {
+                queuedFiles.removeAll(storedFiles);
 
-            for (File storedFile : storedFiles) {
-                if (!storedFile.delete()) {
-                    storedFile.deleteOnExit();
+                for (File storedFile : storedFiles) {
+                    if (!storedFile.delete()) {
+                        storedFile.deleteOnExit();
+                    }
                 }
             }
         } finally {