Prevent deletion attempt if dir doesn't exist (#683)

* prevent deletion attempt if dir doesn't exist * spotless
signalfx · Nov 6, 2023 · 021db76 · 021db76
1 parent f3cdb38
commit 021db76
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 0 deletions.
diff --git a/splunk-otel-android/src/main/java/com/splunk/rum/FileUtils.java b/splunk-otel-android/src/main/java/com/splunk/rum/FileUtils.java
@@ -146,4 +146,8 @@ void safeDelete(File file) {
             Log.w(LOG_TAG, "Error deleting file " + file);
         }
     }
+
+    public boolean exists(File file) {
+        return file.exists();
+    }
 }
diff --git a/splunk-otel-android/src/main/java/com/splunk/rum/StartTypeAwareSpanStorage.java b/splunk-otel-android/src/main/java/com/splunk/rum/StartTypeAwareSpanStorage.java
@@ -159,6 +159,9 @@ private void cleanupUnsentBackgroundSpans() {
                             fileUtils.safeDelete(dir);
                         });
         File backgroundDir = getCurrentSessionBackgroundDirectory();
+        if (!fileUtils.exists(backgroundDir)) {
+            return;
+        }
         if (!fileUtils.listFilesRecursively(backgroundDir).findAny().isPresent()) {
             fileUtils.safeDelete(backgroundDir);
         }

diff --git a/splunk-otel-android/src/test/java/com/splunk/rum/StartTypeAwareSpanStorageTest.java b/splunk-otel-android/src/test/java/com/splunk/rum/StartTypeAwareSpanStorageTest.java
@@ -21,6 +21,7 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -62,6 +63,7 @@ void create_onNewId_shouldCleanOldBackgroundFiles() {
         fileUtils = mock(FileUtils.class);
         when(fileUtils.listDirectories(any())).thenReturn(Stream.of(file));
         when(fileUtils.listFiles(file)).thenReturn(Stream.of(file));
+        when(fileUtils.exists(any())).thenReturn(true);
 
         fileProvider = StartTypeAwareSpanStorage.create(visibleScreenTracker, fileUtils, rootDir);
 
@@ -71,6 +73,19 @@ void create_onNewId_shouldCleanOldBackgroundFiles() {
                 fileProvider.provideSpansDirectory(), fileArgumentCaptor.getAllValues().get(1));
     }
 
+    @Test
+    void doesNotAttemptIfBackgroundDirNotExist() {
+        fileProvider = StartTypeAwareSpanStorage.create(visibleScreenTracker, fileUtils, rootDir);
+        fileUtils = mock(FileUtils.class);
+        when(fileUtils.exists(any())).thenReturn(false);
+        when(fileUtils.listDirectories(any())).thenReturn(Stream.empty());
+
+        fileProvider = StartTypeAwareSpanStorage.create(visibleScreenTracker, fileUtils, rootDir);
+
+        verify(fileUtils, never()).listFiles(any());
+        verify(fileUtils, never()).safeDelete(any());
+    }
+
     @Test
     void create_cleanDoesntRemoveDirIfNotEmpty() {
         String uniqueId = UUID.randomUUID().toString();