Skip to content

Commit 1c81431

Browse files
committed
tv: select the right thing on load
Signed-off-by: Jason A. Donenfeld <[email protected]>
1 parent 3fe9e31 commit 1c81431

File tree

1 file changed

+9
-2
lines changed

1 file changed

+9
-2
lines changed

ui/src/main/java/com/wireguard/android/activity/TvMainActivity.kt

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,13 @@ class TvMainActivity : AppCompatActivity() {
6868
override fun onCreate(savedInstanceState: Bundle?) {
6969
super.onCreate(savedInstanceState)
7070
binding = TvActivityBinding.inflate(layoutInflater)
71-
lifecycleScope.launch { binding.tunnels = Application.getTunnelManager().getTunnels() }
71+
lifecycleScope.launch {
72+
binding.tunnels = Application.getTunnelManager().getTunnels()
73+
if (binding.tunnels?.isEmpty() == true)
74+
binding.importButton.requestFocus()
75+
else
76+
binding.tunnelList.requestFocus()
77+
}
7278
binding.isDeleting = isDeleting
7379
binding.rowConfigurationHandler = object : ObservableKeyedRecyclerViewAdapter.RowConfigurationHandler<TvTunnelListItemBinding, ObservableTunnel> {
7480
override fun onConfigureRow(binding: TvTunnelListItemBinding, item: ObservableTunnel, position: Int) {
@@ -122,7 +128,8 @@ class TvMainActivity : AppCompatActivity() {
122128

123129
private suspend fun updateStats() {
124130
binding.tunnelList.forEach { viewItem ->
125-
val listItem = DataBindingUtil.findBinding<TvTunnelListItemBinding>(viewItem) ?: return@forEach
131+
val listItem = DataBindingUtil.findBinding<TvTunnelListItemBinding>(viewItem)
132+
?: return@forEach
126133
try {
127134
val tunnel = listItem.item!!
128135
if (tunnel.state != Tunnel.State.UP || isDeleting.get()) {

0 commit comments

Comments
 (0)