From 0ff47f7ab5aa08b34be43e653021f9b6d0e53b84 Mon Sep 17 00:00:00 2001
From: kari-ts <135075563+kari-ts@users.noreply.github.com>
Date: Thu, 16 May 2024 17:05:20 -0700
Subject: [PATCH] android: fix import (#400)

Updates #cleanup

Signed-off-by: kari-ts <kari@tailscale.com>
---
 .../ipn/ui/viewModel/MainViewModel.kt         | 50 +++++++++----------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/android/src/main/java/com/tailscale/ipn/ui/viewModel/MainViewModel.kt b/android/src/main/java/com/tailscale/ipn/ui/viewModel/MainViewModel.kt
index 8a01cd5..70c9842 100644
--- a/android/src/main/java/com/tailscale/ipn/ui/viewModel/MainViewModel.kt
+++ b/android/src/main/java/com/tailscale/ipn/ui/viewModel/MainViewModel.kt
@@ -18,7 +18,6 @@ import com.tailscale.ipn.ui.util.PeerCategorizer
 import com.tailscale.ipn.ui.util.PeerSet
 import com.tailscale.ipn.ui.util.TimeUtil
 import com.tailscale.ipn.ui.util.set
-import com.tailscale.ipn.App
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.combine
@@ -60,21 +59,22 @@ class MainViewModel : IpnViewModel() {
 
     viewModelScope.launch {
       var previousState: State? = null
-  
+
       combine(Notifier.state, vpnPrepared) { state, prepared -> state to prepared }
           .collect { (currentState, prepared) ->
-              stateRes.set(userStringRes(currentState, previousState, prepared))
-  
-              val isOn = when {
+            stateRes.set(userStringRes(currentState, previousState, prepared))
+
+            val isOn =
+                when {
                   currentState == State.Running || currentState == State.Starting -> true
                   previousState == State.NoState && currentState == State.Starting -> true
                   else -> false
-              }
-  
-              _vpnToggleState.value = isOn
-              previousState = currentState
+                }
+
+            _vpnToggleState.value = isOn
+            previousState = currentState
           }
-  }
+    }
 
     viewModelScope.launch {
       Notifier.netmap.collect { it ->
@@ -118,11 +118,11 @@ class MainViewModel : IpnViewModel() {
     val isPrepared = vpnPrepared.value
 
     when {
-        !isPrepared -> showVPNPermissionLauncherIfUnauthorized()
-        state == Ipn.State.Running -> stopVPN()
-        else -> startVPN()
+      !isPrepared -> showVPNPermissionLauncherIfUnauthorized()
+      state == Ipn.State.Running -> stopVPN()
+      else -> startVPN()
     }
-}
+  }
 
   fun searchPeers(searchTerm: String) {
     this.searchTerm.set(searchTerm)
@@ -139,15 +139,15 @@ class MainViewModel : IpnViewModel() {
 
 private fun userStringRes(currentState: State?, previousState: State?, vpnPrepared: Boolean): Int {
   return when {
-      previousState == State.NoState && currentState == State.Starting -> R.string.starting
-      currentState == State.NoState -> R.string.placeholder
-      currentState == State.InUseOtherUser -> R.string.placeholder
-      currentState == State.NeedsLogin -> if (vpnPrepared) R.string.please_login else R.string.connect_to_vpn
-      currentState == State.NeedsMachineAuth -> R.string.needs_machine_auth
-      currentState == State.Stopped -> R.string.stopped
-      currentState == State.Starting -> R.string.starting
-      currentState == State.Running -> R.string.connected
-      else -> R.string.placeholder
+    previousState == State.NoState && currentState == State.Starting -> R.string.starting
+    currentState == State.NoState -> R.string.placeholder
+    currentState == State.InUseOtherUser -> R.string.placeholder
+    currentState == State.NeedsLogin ->
+        if (vpnPrepared) R.string.please_login else R.string.connect_to_vpn
+    currentState == State.NeedsMachineAuth -> R.string.needs_machine_auth
+    currentState == State.Stopped -> R.string.stopped
+    currentState == State.Starting -> R.string.starting
+    currentState == State.Running -> R.string.connected
+    else -> R.string.placeholder
   }
-  return resId
-}
\ No newline at end of file
+}