Merge pull request #2442 from square/py/storage

Remove cleanup requirement for storage permission
square · Nov 10, 2022 · dd7c459 · dd7c459
2 parents e306e5c + 50cbf41
commit dd7c459
Showing 1 changed file with 19 additions and 19 deletions.
diff --git a/leakcanary-android-core/src/main/java/leakcanary/internal/LeakDirectoryProvider.kt b/leakcanary-android-core/src/main/java/leakcanary/internal/LeakDirectoryProvider.kt
@@ -43,24 +43,6 @@ internal class LeakDirectoryProvider constructor(
 ) {
   private val context: Context = context.applicationContext
 
-  fun listFiles(filter: FilenameFilter): MutableList<File> {
-    if (!hasStoragePermission() && requestExternalStoragePermission()) {
-      requestWritePermissionNotification()
-    }
-    val files = ArrayList<File>()
-
-    val externalFiles = externalStorageDirectory().listFiles(filter)
-    if (externalFiles != null) {
-      files.addAll(externalFiles)
-    }
-
-    val appFiles = appStorageDirectory().listFiles(filter)
-    if (appFiles != null) {
-      files.addAll(appFiles)
-    }
-    return files
-  }
-
   fun newHeapDumpFile(): File? {
     cleanupOldHeapDumps()
 
@@ -147,7 +129,7 @@ internal class LeakDirectoryProvider constructor(
   }
 
   private fun cleanupOldHeapDumps() {
-    val hprofFiles = listFiles { _, name ->
+    val hprofFiles = listWritableFiles { _, name ->
       name.endsWith(
         HPROF_SUFFIX
       )
@@ -177,6 +159,24 @@ internal class LeakDirectoryProvider constructor(
     }
   }
 
+  private fun listWritableFiles(filter: FilenameFilter): MutableList<File> {
+    val files = ArrayList<File>()
+
+    val externalStorageDirectory = externalStorageDirectory()
+    if (externalStorageDirectory.exists() && externalStorageDirectory.canWrite()) {
+      val externalFiles = externalStorageDirectory.listFiles(filter)
+      if (externalFiles != null) {
+        files.addAll(externalFiles)
+      }
+    }
+
+    val appFiles = appStorageDirectory().listFiles(filter)
+    if (appFiles != null) {
+      files.addAll(appFiles)
+    }
+    return files
+  }
+
   companion object {
     @Volatile private var writeExternalStorageGranted: Boolean = false
     @Volatile private var permissionNotificationDisplayed: Boolean = false