diff options
Diffstat (limited to 'ui/src/main')
| -rw-r--r-- | ui/src/main/java/com/wireguard/android/activity/TvMainActivity.kt | 34 |
1 files changed, 24 insertions, 10 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 004d26e0..32fbe387 100644 --- a/ui/src/main/java/com/wireguard/android/activity/TvMainActivity.kt +++ b/ui/src/main/java/com/wireguard/android/activity/TvMainActivity.kt @@ -46,6 +46,14 @@ import kotlinx.coroutines.withContext import java.io.File 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() + } + } + } private var pendingTunnel: ObservableTunnel? = null private val permissionActivityResultLauncher = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { val tunnel = pendingTunnel @@ -145,16 +153,22 @@ class TvMainActivity : AppCompatActivity() { } binding.importButton.setOnClickListener { - if (filesRoot.get()?.isEmpty() != false) { - navigateTo(myComputerFile) - runOnUiThread { - binding.filesList.requestFocus() - } - } else { - files.clear() - filesRoot.set("") - runOnUiThread { - binding.tunnelList.requestFocus() + try { + if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) + throw Exception() + tunnelFileImportResultLauncher.launch("*/*") + } catch (_: Throwable) { + if (filesRoot.get()?.isEmpty() != false) { + navigateTo(myComputerFile) + runOnUiThread { + binding.filesList.requestFocus() + } + } else { + files.clear() + filesRoot.set("") + runOnUiThread { + binding.tunnelList.requestFocus() + } } } } |