ui: raise min SDK to 24HEADmaster

The difference between the usage of 21 and 24 is not big enough to hold
on to all the baggage from API 21

Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>

1 files changed, 7 insertions, 24 deletions

diff --git a/ui/src/main/java/com/wireguard/android/activity/TvMainActivity.kt b/ui/src/main/java/com/wireguard/android/activity/TvMainActivity.kt
index 3084d314..a20c983c 100644
--- a/ui/src/main/java/com/wireguard/android/activity/TvMainActivity.kt
+++ b/ui/src/main/java/com/wireguard/android/activity/TvMainActivity.kt
@@ -266,31 +266,14 @@ class TvMainActivity : AppCompatActivity() {
     private suspend fun makeStorageRoots(): Collection<KeyedFile> = withContext(Dispatchers.IO) {
         cachedRoots?.let { return@withContext it }
         val list = HashSet<KeyedFile>()
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-            val storageManager: StorageManager = getSystemService() ?: return@withContext list
-            list.addAll(storageManager.storageVolumes.mapNotNull { volume ->
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-                    volume.directory?.let { KeyedFile(it, volume.getDescription(this@TvMainActivity)) }
-                } else {
-                    KeyedFile((StorageVolume::class.java.getMethod("getPathFile").invoke(volume) as File), volume.getDescription(this@TvMainActivity))
-                }
-            })
-        } else {
-            @Suppress("DEPRECATION")
-            list.add(KeyedFile(Environment.getExternalStorageDirectory()))
-            try {
-                File("/storage").listFiles()?.forEach {
-                    if (!it.isDirectory) return@forEach
-                    try {
-                        if (Environment.isExternalStorageRemovable(it)) {
-                            list.add(KeyedFile(it))
-                        }
-                    } catch (_: Throwable) {
-                    }
-                }
-            } catch (_: Throwable) {
+        val storageManager: StorageManager = getSystemService() ?: return@withContext list
+        list.addAll(storageManager.storageVolumes.mapNotNull { volume ->
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+                volume.directory?.let { KeyedFile(it, volume.getDescription(this@TvMainActivity)) }
+            } else {
+                KeyedFile((StorageVolume::class.java.getMethod("getPathFile").invoke(volume) as File), volume.getDescription(this@TvMainActivity))
             }
-        }
+        })
         cachedRoots = list
         list
     }