summaryrefslogtreecommitdiffhomepage
path: root/android
diff options
context:
space:
mode:
authorDavid Göransson <david.goransson@mullvad.net>2024-07-31 11:34:06 +0200
committerDavid Göransson <david.goransson@mullvad.net>2024-07-31 11:34:06 +0200
commitc7f81f5aad8b20f94bb8cc43cdc06065086c78d1 (patch)
tree484c210f08dee63a8f35de24d1a54b5609de746b /android
parent563f107012de0dfd8ccf37a4a0f47a5d50e5b6cb (diff)
parent4ca2139ab5d9cdb427641a7e0f391c27a67194a5 (diff)
downloadmullvadvpn-c7f81f5aad8b20f94bb8cc43cdc06065086c78d1.tar.xz
mullvadvpn-c7f81f5aad8b20f94bb8cc43cdc06065086c78d1.zip
Merge branch 'crash-if-privacy-policy-is-not-accepted-and-user-leaves-the-droid-1216'
Diffstat (limited to 'android')
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt4
1 files changed, 3 insertions, 1 deletions
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt
index 1d9de026af..d4bcf3776a 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt
@@ -91,7 +91,9 @@ class MainActivity : ComponentActivity(), AndroidScopeComponent {
override fun onStop() {
super.onStop()
- serviceConnectionManager.unbind()
+ if (privacyDisclaimerRepository.hasAcceptedPrivacyDisclosure()) {
+ serviceConnectionManager.unbind()
+ }
}
override fun onDestroy() {