Refactor connection state tests

gujjwal00 · Feb 23, 2024 · 19f22bd · 19f22bd
1 parent 923575c
commit 19f22bd
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 8 deletions.
diff --git a/app/src/main/java/com/gaurav/avnc/ui/vnc/LoginFragment.kt b/app/src/main/java/com/gaurav/avnc/ui/vnc/LoginFragment.kt
@@ -21,6 +21,7 @@ import com.gaurav.avnc.databinding.FragmentCredentialBinding
 import com.gaurav.avnc.model.LoginInfo
 import com.gaurav.avnc.model.ServerProfile
 import com.gaurav.avnc.viewmodel.VncViewModel
+import com.gaurav.avnc.viewmodel.VncViewModel.State.Companion.isConnected
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.textfield.TextInputLayout
 
@@ -114,7 +115,7 @@ class LoginFragment : DialogFragment() {
         // Use activity as owner because this fragment will likely be destroyed before connecting
         viewModel.state.observe(requireActivity(), object : Observer<VncViewModel.State> {
             override fun onChanged(value: VncViewModel.State) {
-                if (value == VncViewModel.State.Connected) {
+                if (value.isConnected) {
                     setLoginInfoInProfile(viewModel.profile, loginInfo)
                     viewModel.saveProfile()
                     viewModel.state.removeObserver(this)

diff --git a/app/src/main/java/com/gaurav/avnc/ui/vnc/Toolbar.kt b/app/src/main/java/com/gaurav/avnc/ui/vnc/Toolbar.kt
@@ -23,6 +23,7 @@ import androidx.drawerlayout.widget.DrawerLayout
 import androidx.lifecycle.lifecycleScope
 import com.gaurav.avnc.R
 import com.gaurav.avnc.viewmodel.VncViewModel.State
+import com.gaurav.avnc.viewmodel.VncViewModel.State.Companion.isConnected
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 
@@ -131,15 +132,13 @@ class Toolbar(private val activity: VncActivity, private val dispatcher: Dispatc
     }
 
     private fun onStateChange(state: State) {
-        val isConnected = (state == State.Connected)
-
-        if (isConnected)
+        if (state.isConnected)
             highlightForFirstTimeUser()
 
         if (Build.VERSION.SDK_INT >= 29)
             updateGestureExclusionRect()
 
-        updateLockMode(isConnected)
+        updateLockMode(state.isConnected)
     }
 
     /**
@@ -204,7 +203,7 @@ class Toolbar(private val activity: VncActivity, private val dispatcher: Dispatc
      */
     @RequiresApi(29)
     private fun updateGestureExclusionRect() {
-        if (!openWithSwipe || viewModel.state.value != State.Connected) {
+        if (!openWithSwipe || !viewModel.state.value.isConnected) {
             drawerLayout.systemGestureExclusionRects = listOf()
         } else {
             // Area covered by primaryButtons, in drawerLayout's coordinate space

diff --git a/app/src/main/java/com/gaurav/avnc/ui/vnc/VncActivity.kt b/app/src/main/java/com/gaurav/avnc/ui/vnc/VncActivity.kt
@@ -39,6 +39,7 @@ import com.gaurav.avnc.model.ServerProfile
 import com.gaurav.avnc.util.DeviceAuthPrompt
 import com.gaurav.avnc.util.SamsungDex
 import com.gaurav.avnc.viewmodel.VncViewModel
+import com.gaurav.avnc.viewmodel.VncViewModel.State.Companion.isConnected
 import com.gaurav.avnc.vnc.VncUri
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
@@ -185,7 +186,7 @@ class VncActivity : AppCompatActivity() {
     }
 
     private fun onClientStateChanged(newState: VncViewModel.State) {
-        val isConnected = (newState == VncViewModel.State.Connected)
+        val isConnected = newState.isConnected
 
         binding.frameView.isVisible = isConnected
         binding.frameView.keepScreenOn = isConnected && viewModel.pref.viewer.keepScreenOn

diff --git a/app/src/main/java/com/gaurav/avnc/viewmodel/VncViewModel.kt b/app/src/main/java/com/gaurav/avnc/viewmodel/VncViewModel.kt
@@ -93,7 +93,12 @@ class VncViewModel(val profile: ServerProfile, app: Application) : BaseViewModel
         Created,
         Connecting,
         Connected,
-        Disconnected,
+        Disconnected;
+
+        companion object {
+            val State?.isConnected get() = (this == Connected)
+            val State?.isDisconnected get() = (this == Disconnected)
+        }
     }
 
     val client = VncClient(this)