Merge branch 'crash-if-privacy-policy-is-not-accepted-and-user-leaves-the-droid-1216'

Rawa · Rawa · commit c7f81f5aad8b · 2024-07-31T11:34:06.000+02:00
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
@@ -91,7 +91,9 @@ class MainActivity : ComponentActivity(), AndroidScopeComponent {
 
     override fun onStop() {
         super.onStop()
-        serviceConnectionManager.unbind()
+        if (privacyDisclaimerRepository.hasAcceptedPrivacyDisclosure()) {
+            serviceConnectionManager.unbind()
+        }
     }
 
     override fun onDestroy() {

Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,9 @@ class MainActivity : ComponentActivity(), AndroidScopeComponent {`
`91`	`91`
`92`	`92`	`override fun onStop() {`
`93`	`93`	`super.onStop()`
`94`		`- serviceConnectionManager.unbind()`
	`94`	`+ if (privacyDisclaimerRepository.hasAcceptedPrivacyDisclosure()) {`
	`95`	`+ serviceConnectionManager.unbind()`
	`96`	`+ }`
`95`	`97`	`}`
`96`	`98`
`97`	`99`	`override fun onDestroy() {`