tv: select the right thing on load

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>

1 files changed, 9 insertions, 2 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 7b93f563..d6840993 100644
--- a/ui/src/main/java/com/wireguard/android/activity/TvMainActivity.kt
+++ b/ui/src/main/java/com/wireguard/android/activity/TvMainActivity.kt
@@ -68,7 +68,13 @@ class TvMainActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         binding = TvActivityBinding.inflate(layoutInflater)
-        lifecycleScope.launch { binding.tunnels = Application.getTunnelManager().getTunnels() }
+        lifecycleScope.launch {
+            binding.tunnels = Application.getTunnelManager().getTunnels()
+            if (binding.tunnels?.isEmpty() == true)
+                binding.importButton.requestFocus()
+            else
+                binding.tunnelList.requestFocus()
+        }
         binding.isDeleting = isDeleting
         binding.rowConfigurationHandler = object : ObservableKeyedRecyclerViewAdapter.RowConfigurationHandler<TvTunnelListItemBinding, ObservableTunnel> {
             override fun onConfigureRow(binding: TvTunnelListItemBinding, item: ObservableTunnel, position: Int) {
@@ -122,7 +128,8 @@ class TvMainActivity : AppCompatActivity() {
 
     private suspend fun updateStats() {
         binding.tunnelList.forEach { viewItem ->
-            val listItem = DataBindingUtil.findBinding<TvTunnelListItemBinding>(viewItem) ?: return@forEach
+            val listItem = DataBindingUtil.findBinding<TvTunnelListItemBinding>(viewItem)
+                    ?: return@forEach
             try {
                 val tunnel = listItem.item!!
                 if (tunnel.state != Tunnel.State.UP || isDeleting.get()) {