diff options
Diffstat (limited to '')
3 files changed, 7 insertions, 29 deletions
diff --git a/ui/src/main/java/com/wireguard/android/activity/SettingsActivity.kt b/ui/src/main/java/com/wireguard/android/activity/SettingsActivity.kt index 5ce71792..33f44cd6 100644 --- a/ui/src/main/java/com/wireguard/android/activity/SettingsActivity.kt +++ b/ui/src/main/java/com/wireguard/android/activity/SettingsActivity.kt @@ -72,10 +72,6 @@ class SettingsActivity : AppCompatActivity() { darkTheme?.parent?.removePreference(darkTheme) --preferenceScreen.initialExpandedChildrenCount } - if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) { - val remoteApps = preferenceManager.findPreference<Preference>("allow_remote_control_intents") - remoteApps?.parent?.removePreference(remoteApps) - } if (AdminKnobs.disableConfigExport) { val zipExporter = preferenceManager.findPreference<Preference>("zip_exporter") zipExporter?.parent?.removePreference(zipExporter) diff --git a/ui/src/main/java/com/wireguard/android/activity/TunnelToggleActivity.kt b/ui/src/main/java/com/wireguard/android/activity/TunnelToggleActivity.kt index dfc1f5b8..a0e9aa06 100644 --- a/ui/src/main/java/com/wireguard/android/activity/TunnelToggleActivity.kt +++ b/ui/src/main/java/com/wireguard/android/activity/TunnelToggleActivity.kt @@ -22,7 +22,6 @@ import com.wireguard.android.backend.Tunnel import com.wireguard.android.util.ErrorMessages import kotlinx.coroutines.launch -@RequiresApi(Build.VERSION_CODES.N) class TunnelToggleActivity : AppCompatActivity() { private val permissionActivityResultLauncher = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { toggleTunnelWithPermissionsResult() } 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 } |