summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorAlbin <albin@mullvad.net>2022-05-31 10:12:56 +0200
committerAlbin <albin@mullvad.net>2022-05-31 14:23:23 +0200
commite18b1b4b645d5e2de947f65261ff6fbbec5645b1 (patch)
tree528478e55283aec682f046b1783d683b46198d9a
parent2a4bb75480b87b6812a81f8ed50a8dcca49b842f (diff)
downloadmullvadvpn-e18b1b4b645d5e2de947f65261ff6fbbec5645b1.tar.xz
mullvadvpn-e18b1b4b645d5e2de947f65261ff6fbbec5645b1.zip
Fix lifecycle owner view crash
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/ConnectFragment.kt5
1 files changed, 2 insertions, 3 deletions
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/ConnectFragment.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/ConnectFragment.kt
index efc32a303f..43d23445ce 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/ConnectFragment.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/ConnectFragment.kt
@@ -5,7 +5,6 @@ import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import androidx.core.content.ContextCompat
-import androidx.lifecycle.lifecycleScope
import kotlinx.coroutines.delay
import kotlinx.coroutines.flow.collect
import kotlinx.coroutines.flow.map
@@ -96,7 +95,7 @@ class ConnectFragment :
}
connectionProxy.onUiStateChange.subscribe(this) { uiState ->
- viewLifecycleOwner.lifecycleScope.launchWhenStarted {
+ jobTracker.newUiJob("updateTunnelState") {
updateTunnelState(uiState, connectionProxy.state)
}
}
@@ -114,7 +113,7 @@ class ConnectFragment :
}
override fun onSafelyStop() {
- jobTracker.cancelJob("updateAccountExpiry")
+ jobTracker.cancelAllJobs()
locationInfoCache.onNewLocation = null
relayListListener.onRelayListChange = null