Fix resume navigates back

Fixes the automatic back navigation when the Android app is resumed by
simplifying the state handling (redudant state removed).

1 files changed, 2 insertions, 9 deletions

diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ServiceDependentFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ServiceDependentFragment.kt
index 024c290b9d..114b465391 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ServiceDependentFragment.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ServiceDependentFragment.kt
@@ -28,8 +28,7 @@ abstract class ServiceDependentFragment(private val onNoService: OnNoService) :
         Initialized,
         Active,
         Stopped,
-        LostConnection,
-        WaitingForReconnection,
+        LostConnection
     }
 
     private var state = State.Uninitialized
@@ -81,7 +80,6 @@ abstract class ServiceDependentFragment(private val onNoService: OnNoService) :
         synchronized(this) {
             when (state) {
                 State.Uninitialized -> state = State.Initialized
-                State.WaitingForReconnection -> state = State.Stopped
                 State.Active -> {
                     onSafelyStop()
                     onSafelyStart()
@@ -102,7 +100,6 @@ abstract class ServiceDependentFragment(private val onNoService: OnNoService) :
                     state = State.LostConnection
                     leaveFragment()
                 }
-                State.Stopped -> state = State.WaitingForReconnection
                 else -> {}
             }
         }
@@ -118,7 +115,7 @@ abstract class ServiceDependentFragment(private val onNoService: OnNoService) :
                 State.Initialized, State.Active, State.Stopped -> {
                     onSafelyCreateView(inflater, container, savedInstanceState)
                 }
-                State.Uninitialized, State.LostConnection, State.WaitingForReconnection -> {
+                State.Uninitialized, State.LostConnection -> {
                     inflater.inflate(R.layout.missing_service, container, false)
                 }
             }
@@ -134,10 +131,6 @@ abstract class ServiceDependentFragment(private val onNoService: OnNoService) :
                     state = State.Active
                     onSafelyStart()
                 }
-                State.WaitingForReconnection -> {
-                    state = State.LostConnection
-                    leaveFragment()
-                }
                 else -> {}
             }
         }