Change fragment visibility lifecycle

10 files changed, 35 insertions, 35 deletions

diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AccountFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AccountFragment.kt
index 20851572e9..d24478cb98 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AccountFragment.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AccountFragment.kt
@@ -85,7 +85,7 @@ class AccountFragment : ServiceDependentFragment(OnNoService.GoBack) {
         return view
     }
 
-    override fun onSafelyResume() {
+    override fun onSafelyStart() {
         accountCache.onAccountNumberChange.subscribe(this) { accountNumber ->
             jobTracker.newUiJob("updateAccountNumber") {
                 accountNumberView.information = accountNumber
@@ -112,7 +112,7 @@ class AccountFragment : ServiceDependentFragment(OnNoService.GoBack) {
         }
     }
 
-    override fun onSafelyPause() {
+    override fun onSafelyStop() {
         accountCache.onAccountNumberChange.unsubscribe(this)
         accountCache.onAccountExpiryChange.unsubscribe(this)
     }
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ConnectFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ConnectFragment.kt
index b1a4f6f2cb..3d9f95fa71 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ConnectFragment.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ConnectFragment.kt
@@ -76,7 +76,7 @@ class ConnectFragment : ServiceDependentFragment(OnNoService.GoToLaunchScreen) {
         return view
     }
 
-    override fun onSafelyResume() {
+    override fun onSafelyStart() {
         locationInfo.isTunnelInfoExpanded = isTunnelInfoExpanded
 
         notificationBanner.onResume()
@@ -109,7 +109,7 @@ class ConnectFragment : ServiceDependentFragment(OnNoService.GoToLaunchScreen) {
         }
     }
 
-    override fun onSafelyPause() {
+    override fun onSafelyStop() {
         locationInfoCache.onNewLocation = null
         relayListListener.onRelayListChange = null
 
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/LoginFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/LoginFragment.kt
index 643e5137cd..ec8da11abb 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/LoginFragment.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/LoginFragment.kt
@@ -60,7 +60,7 @@ class LoginFragment : ServiceDependentFragment(OnNoService.GoToLaunchScreen) {
         return view
     }
 
-    override fun onSafelyResume() {
+    override fun onSafelyStart() {
         jobTracker.newUiJob("advanceToNextScreen") {
             when (loggedIn.await()) {
                 LoginResult.ExistingAccountWithTime -> openNextScreen(ConnectFragment())
@@ -72,7 +72,7 @@ class LoginFragment : ServiceDependentFragment(OnNoService.GoToLaunchScreen) {
         fetchHistory()
     }
 
-    override fun onSafelyPause() {
+    override fun onSafelyStop() {
         jobTracker.cancelJob("advanceToNextScreen")
     }
 
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/OutOfTimeFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/OutOfTimeFragment.kt
index 01a35b8d51..5fd14b5cd6 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/OutOfTimeFragment.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/OutOfTimeFragment.kt
@@ -68,7 +68,7 @@ class OutOfTimeFragment : ServiceDependentFragment(OnNoService.GoToLaunchScreen)
         return view
     }
 
-    override fun onSafelyResume() {
+    override fun onSafelyStart() {
         accountCache.onAccountExpiryChange.subscribe(this) { expiry ->
             checkExpiry(expiry)
         }
@@ -81,7 +81,7 @@ class OutOfTimeFragment : ServiceDependentFragment(OnNoService.GoToLaunchScreen)
         }
     }
 
-    override fun onSafelyPause() {
+    override fun onSafelyStop() {
         accountCache.onAccountExpiryChange.unsubscribe(this)
         jobTracker.cancelJob("pollAccountData")
     }
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/SelectLocationFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/SelectLocationFragment.kt
index db09e6b395..5ea1c1bfc5 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/SelectLocationFragment.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/SelectLocationFragment.kt
@@ -80,7 +80,7 @@ class SelectLocationFragment : ServiceDependentFragment(OnNoService.GoToLaunchSc
         return view
     }
 
-    override fun onSafelyResume() {
+    override fun onSafelyStart() {
         // If the relay list is immediately available, setting the listener will cause it to be
         // called right away, while the state is still Initializing. In that case we can skip
         // showing the spinner animation and go directly to the Visible state.
@@ -118,7 +118,7 @@ class SelectLocationFragment : ServiceDependentFragment(OnNoService.GoToLaunchSc
         }
     }
 
-    override fun onSafelyPause() {
+    override fun onSafelyStop() {
         relayListListener.onRelayListChange = null
     }
 
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 efcdfdec05..ad8863b2c5 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ServiceDependentFragment.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ServiceDependentFragment.kt
@@ -25,7 +25,7 @@ abstract class ServiceDependentFragment(val onNoService: OnNoService) : ServiceA
         Uninitialized,
         Initialized,
         Active,
-        Paused,
+        Stopped,
         LostConnection,
         WaitingForReconnection,
     }
@@ -78,7 +78,7 @@ abstract class ServiceDependentFragment(val onNoService: OnNoService) : ServiceA
         synchronized(this) {
             when (state) {
                 State.Uninitialized -> state = State.Initialized
-                State.WaitingForReconnection -> state = State.Paused
+                State.WaitingForReconnection -> state = State.Stopped
                 else -> {}
             }
         }
@@ -95,7 +95,7 @@ abstract class ServiceDependentFragment(val onNoService: OnNoService) : ServiceA
                     state = State.LostConnection
                     leaveFragment()
                 }
-                State.Paused -> state = State.WaitingForReconnection
+                State.Stopped -> state = State.WaitingForReconnection
                 else -> {}
             }
         }
@@ -108,7 +108,7 @@ abstract class ServiceDependentFragment(val onNoService: OnNoService) : ServiceA
     ): View {
         synchronized(this) {
             when (state) {
-                State.Initialized, State.Active, State.Paused -> {
+                State.Initialized, State.Active, State.Stopped -> {
                     return onSafelyCreateView(inflater, container, savedInstanceState)
                 }
                 State.Uninitialized, State.LostConnection, State.WaitingForReconnection -> {
@@ -118,14 +118,14 @@ abstract class ServiceDependentFragment(val onNoService: OnNoService) : ServiceA
         }
     }
 
-    override fun onResume() {
-        super.onResume()
+    override fun onStart() {
+        super.onStart()
 
         synchronized(this) {
             when (state) {
-                State.Initialized, State.Paused -> {
+                State.Initialized, State.Stopped -> {
                     state = State.Active
-                    onSafelyResume()
+                    onSafelyStart()
                 }
                 State.WaitingForReconnection -> {
                     state = State.LostConnection
@@ -139,7 +139,7 @@ abstract class ServiceDependentFragment(val onNoService: OnNoService) : ServiceA
     override fun onSaveInstanceState(instanceState: Bundle) {
         synchronized(this) {
             when (state) {
-                State.Initialized, State.Paused, State.Active -> {
+                State.Initialized, State.Stopped, State.Active -> {
                     onSafelySaveInstanceState(instanceState)
                 }
                 else -> {}
@@ -147,24 +147,24 @@ abstract class ServiceDependentFragment(val onNoService: OnNoService) : ServiceA
         }
     }
 
-    override fun onPause() {
+    override fun onStop() {
         synchronized(this) {
             when (state) {
                 State.Initialized, State.Active -> {
-                    onSafelyPause()
-                    state = State.Paused
+                    onSafelyStop()
+                    state = State.Stopped
                 }
                 else -> {}
             }
         }
 
-        super.onPause()
+        super.onStop()
     }
 
     override fun onDestroyView() {
         synchronized(this) {
             when (state) {
-                State.Initialized, State.Paused, State.Active -> onSafelyDestroyView()
+                State.Initialized, State.Stopped, State.Active -> onSafelyDestroyView()
                 else -> {}
             }
         }
@@ -178,13 +178,13 @@ abstract class ServiceDependentFragment(val onNoService: OnNoService) : ServiceA
         savedInstanceState: Bundle?
     ): View
 
-    open fun onSafelyResume() {
+    open fun onSafelyStart() {
     }
 
     open fun onSafelySaveInstanceState(state: Bundle) {
     }
 
-    open fun onSafelyPause() {
+    open fun onSafelyStop() {
     }
 
     open fun onSafelyDestroyView() {
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/SettingsFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/SettingsFragment.kt
index f0f4483e16..641156fed7 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/SettingsFragment.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/SettingsFragment.kt
@@ -77,14 +77,14 @@ class SettingsFragment : ServiceAwareFragment() {
         return view
     }
 
-    override fun onResume() {
-        super.onResume()
+    override fun onStart() {
+        super.onStart()
 
         configureListeners()
         active = true
     }
 
-    override fun onPause() {
+    override fun onStop() {
         active = false
         versionInfoCache?.onUpdate = null
 
@@ -93,7 +93,7 @@ class SettingsFragment : ServiceAwareFragment() {
             onAccountExpiryChange.unsubscribe(this@SettingsFragment)
         }
 
-        super.onPause()
+        super.onStop()
     }
 
     override fun onDestroyView() {
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/SplitTunnelingFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/SplitTunnelingFragment.kt
index 5d2fa1cae5..b5779f9f72 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/SplitTunnelingFragment.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/SplitTunnelingFragment.kt
@@ -86,7 +86,7 @@ class SplitTunnelingFragment : ServiceDependentFragment(OnNoService.GoToLaunchSc
         return view
     }
 
-    override fun onSafelyPause() {
+    override fun onSafelyStop() {
         jobTracker.newBackgroundJob("persistExcludedApps") {
             splitTunneling.persist()
         }
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/WelcomeFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/WelcomeFragment.kt
index 7c19f02098..36fea18303 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/WelcomeFragment.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/WelcomeFragment.kt
@@ -54,7 +54,7 @@ class WelcomeFragment : ServiceDependentFragment(OnNoService.GoToLaunchScreen) {
         return view
     }
 
-    override fun onSafelyResume() {
+    override fun onSafelyStart() {
         accountCache.onAccountNumberChange.subscribe(this) { account ->
             updateAccountNumber(account)
         }
@@ -71,7 +71,7 @@ class WelcomeFragment : ServiceDependentFragment(OnNoService.GoToLaunchScreen) {
         }
     }
 
-    override fun onSafelyPause() {
+    override fun onSafelyStop() {
         accountCache.onAccountNumberChange.unsubscribe(this)
         accountCache.onAccountExpiryChange.unsubscribe(this)
         jobTracker.cancelJob("pollAccountData")
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/WireguardKeyFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/WireguardKeyFragment.kt
index c57291f804..05d136e4cb 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/WireguardKeyFragment.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/WireguardKeyFragment.kt
@@ -141,7 +141,7 @@ class WireguardKeyFragment : ServiceDependentFragment(OnNoService.GoToLaunchScre
         return view
     }
 
-    override fun onSafelyResume() {
+    override fun onSafelyStart() {
         connectionProxy.onUiStateChange.subscribe(this) { uiState ->
             jobTracker.newUiJob("tunnelStateUpdate") {
                 synchronized(this@WireguardKeyFragment) {
@@ -169,7 +169,7 @@ class WireguardKeyFragment : ServiceDependentFragment(OnNoService.GoToLaunchScre
         actionState = ActionState.Idle(false)
     }
 
-    override fun onSafelyPause() {
+    override fun onSafelyStop() {
         connectionProxy.onUiStateChange.unsubscribe(this)
         keyStatusListener.onKeyStatusChange.unsubscribe(this)