diff options
Diffstat (limited to 'ui/src/main/java/com')
8 files changed, 10 insertions, 38 deletions
diff --git a/ui/src/main/java/com/wireguard/android/QuickTileService.kt b/ui/src/main/java/com/wireguard/android/QuickTileService.kt index a8650b78..a849c481 100644 --- a/ui/src/main/java/com/wireguard/android/QuickTileService.kt +++ b/ui/src/main/java/com/wireguard/android/QuickTileService.kt @@ -32,7 +32,6 @@ import kotlinx.coroutines.launch * system framework as necessary to update the appearance of the tile in the system UI, and to * forward click events to the application. */ -@RequiresApi(Build.VERSION_CODES.N) class QuickTileService : TileService() { private val onStateChangedCallback = OnStateChangedCallback() private val onTunnelChangedCallback = OnTunnelChangedCallback() 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 } diff --git a/ui/src/main/java/com/wireguard/android/model/TunnelManager.kt b/ui/src/main/java/com/wireguard/android/model/TunnelManager.kt index d7c1391f..e08623d1 100644 --- a/ui/src/main/java/com/wireguard/android/model/TunnelManager.kt +++ b/ui/src/main/java/com/wireguard/android/model/TunnelManager.kt @@ -221,10 +221,9 @@ class TunnelManager(private val configStore: ConfigStore) : BaseObservable() { manager.refreshTunnelStates() return@launch } - if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M || !UserKnobs.allowRemoteControlIntents.first()) + if (!UserKnobs.allowRemoteControlIntents.first()) return@launch - val state: Tunnel.State - state = when (action) { + val state = when (action) { "com.wireguard.android.action.SET_TUNNEL_UP" -> Tunnel.State.UP "com.wireguard.android.action.SET_TUNNEL_DOWN" -> Tunnel.State.DOWN else -> return@launch diff --git a/ui/src/main/java/com/wireguard/android/updater/Updater.kt b/ui/src/main/java/com/wireguard/android/updater/Updater.kt index 46d0fe34..27e2cba0 100644 --- a/ui/src/main/java/com/wireguard/android/updater/Updater.kt +++ b/ui/src/main/java/com/wireguard/android/updater/Updater.kt @@ -264,7 +264,7 @@ object Updater { throw IOException("Update could not be fetched: ${connection.responseCode}") var downloadedByteLen: ULong = 0UL - val totalByteLen = (if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) connection.contentLengthLong else connection.contentLength).toLong().toULong() + val totalByteLen = connection.contentLengthLong.toULong() val fileBytes = ByteArray(1024 * 32 /* 32 KiB */) val digest = MessageDigest.getInstance("SHA-256") emitProgress(Progress.Downloading(downloadedByteLen, totalByteLen), true) diff --git a/ui/src/main/java/com/wireguard/android/util/QuantityFormatter.kt b/ui/src/main/java/com/wireguard/android/util/QuantityFormatter.kt index 2fbb5c29..abac57c5 100644 --- a/ui/src/main/java/com/wireguard/android/util/QuantityFormatter.kt +++ b/ui/src/main/java/com/wireguard/android/util/QuantityFormatter.kt @@ -31,9 +31,6 @@ object QuantityFormatter { fun formatEpochAgo(epochMillis: Long): String { var span = (System.currentTimeMillis() - epochMillis) / 1000 - if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) - return Application.get().applicationContext.getString(R.string.latest_handshake_ago, span.seconds.toString()) - if (span <= 0L) return RelativeDateTimeFormatter.getInstance().format(RelativeDateTimeFormatter.Direction.PLAIN, RelativeDateTimeFormatter.AbsoluteUnit.NOW) val measureFormat = MeasureFormat.getInstance(Locale.getDefault(), MeasureFormat.FormatWidth.WIDE) diff --git a/ui/src/main/java/com/wireguard/android/widget/SlashDrawable.kt b/ui/src/main/java/com/wireguard/android/widget/SlashDrawable.kt index 79dc3338..c69e6d8b 100644 --- a/ui/src/main/java/com/wireguard/android/widget/SlashDrawable.kt +++ b/ui/src/main/java/com/wireguard/android/widget/SlashDrawable.kt @@ -15,7 +15,6 @@ import androidx.annotation.ColorInt import androidx.annotation.IntRange import androidx.annotation.RequiresApi -@RequiresApi(Build.VERSION_CODES.N) class SlashDrawable(private val mDrawable: Drawable) : Drawable() { private val mPaint = Paint(Paint.ANTI_ALIAS_FLAG) private val mPath = Path() |