aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/ui/src/main/java
diff options
context:
space:
mode:
authorJason A. Donenfeld <Jason@zx2c4.com>2020-09-22 18:17:11 +0200
committerJason A. Donenfeld <Jason@zx2c4.com>2020-09-22 23:54:01 +0200
commitc536bbb7e9105045349af5fc597bae9d5b1001de (patch)
tree01c295c79143c3d73a406c58add83fcc13eb1484 /ui/src/main/java
parenttv: remove tiny words from tv banner (diff)
downloadwireguard-android-c536bbb7e9105045349af5fc597bae9d5b1001de.tar.xz
wireguard-android-c536bbb7e9105045349af5fc597bae9d5b1001de.zip
tv: account for broken TVs with no file picker
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Diffstat (limited to 'ui/src/main/java')
-rw-r--r--ui/src/main/java/com/wireguard/android/activity/TvMainActivity.kt8
1 files changed, 7 insertions, 1 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 7e3d425..7b93f56 100644
--- a/ui/src/main/java/com/wireguard/android/activity/TvMainActivity.kt
+++ b/ui/src/main/java/com/wireguard/android/activity/TvMainActivity.kt
@@ -5,6 +5,7 @@
package com.wireguard.android.activity
+import android.content.ActivityNotFoundException
import android.os.Bundle
import android.util.Log
import android.view.View
@@ -31,6 +32,7 @@ import kotlinx.coroutines.launch
class TvMainActivity : AppCompatActivity() {
private val tunnelFileImportResultLauncher = registerForActivityResult(ActivityResultContracts.GetContent()) { data ->
+ if (data == null) return@registerForActivityResult
lifecycleScope.launch {
TunnelImporter.importTunnel(contentResolver, data) {
Toast.makeText(this@TvMainActivity, it, Toast.LENGTH_LONG).show()
@@ -98,7 +100,11 @@ class TvMainActivity : AppCompatActivity() {
}
}
binding.importButton.setOnClickListener {
- tunnelFileImportResultLauncher.launch("*/*")
+ try {
+ tunnelFileImportResultLauncher.launch("*/*")
+ } catch (e: ActivityNotFoundException) {
+ Toast.makeText(this@TvMainActivity, getString(R.string.tv_error), Toast.LENGTH_LONG).show()
+ }
}
binding.deleteButton.setOnClickListener {
isDeleting.set(!isDeleting.get())