Merge branch 'fix-connect-without-permission'

2 files changed, 7 insertions, 2 deletions

diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/ConnectionProxy.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/ConnectionProxy.kt
index 2b551538e2..17099078d8 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/ConnectionProxy.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/ConnectionProxy.kt
@@ -172,8 +172,12 @@ class ConnectionProxy(val context: Context, val daemon: MullvadDaemon) {
             if (activity != null) {
                 activity.requestVpnPermission(intent)
             } else {
-                val activityIntent = Intent(context, MainActivity::class.java)
-                    .putExtra(MainActivity.KEY_SHOULD_CONNECT, true)
+                val activityIntent = Intent(context, MainActivity::class.java).apply {
+                    addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                    putExtra(MainActivity.KEY_SHOULD_CONNECT, true)
+                }
+
+                uiState = state
 
                 context.startActivity(activityIntent)
             }
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ServiceConnection.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ServiceConnection.kt
index 1da6895fd9..6e621d2a4f 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ServiceConnection.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ServiceConnection.kt
@@ -26,5 +26,6 @@ class ServiceConnection(private val service: ServiceInstance, val mainActivity:
         appVersionInfoCache.onDestroy()
         keyStatusListener.onDestroy()
         relayListListener.onDestroy()
+        connectionProxy.mainActivity = null
     }
 }