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 7e3d425d..7b93f563 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())
diff --git a/ui/src/main/res/values/strings.xml b/ui/src/main/res/values/strings.xml
index 6f4d935a..0bcadbca 100644
--- a/ui/src/main/res/values/strings.xml
+++ b/ui/src/main/res/values/strings.xml
@@ -102,6 +102,7 @@
Use dark theme
Delete
Select tunnel to delete
+ Your TV does not have a file picker
Disable config exporting
Disabling config exporting makes private keys less accessible
DNS servers