3 files changed, 1 insertions, 13 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/ConnectionProxy.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/ConnectionProxy.kt
index 87621286bf..a625531c63 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/ConnectionProxy.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/ConnectionProxy.kt
@@ -10,7 +10,6 @@ import kotlinx.coroutines.launch
 import net.mullvad.mullvadvpn.ipc.Event
 import net.mullvad.mullvadvpn.ipc.Request
 import net.mullvad.mullvadvpn.model.TunnelState
-import net.mullvad.mullvadvpn.ui.MainActivity
 import net.mullvad.talpid.util.EventNotifier
 
 class ConnectionProxy(val vpnPermission: VpnPermission, endpoint: ServiceEndpoint) {
@@ -26,8 +25,6 @@ class ConnectionProxy(val vpnPermission: VpnPermission, endpoint: ServiceEndpoin
 
     private val fetchInitialStateJob = fetchInitialState()
 
-    var mainActivity: MainActivity? = null
-
     var onStateChange = EventNotifier<TunnelState>(initialState)
 
     var state by onStateChange.notifiable()
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt
index d48aba29cd..570475eb34 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt
@@ -13,9 +13,6 @@ import android.view.WindowManager
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentActivity
 import androidx.fragment.app.FragmentManager
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.launch
 import net.mullvad.mullvadvpn.BuildConfig
 import net.mullvad.mullvadvpn.R
 import net.mullvad.mullvadvpn.dataproxy.MullvadProblemReport
@@ -138,7 +135,7 @@ open class MainActivity : FragmentActivity() {
     }
 
     override fun onActivityResult(requestCode: Int, resultCode: Int, resultData: Intent?) {
-        setVpnPermission(resultCode == Activity.RESULT_OK)
+        serviceConnection?.vpnPermission?.grant(resultCode == Activity.RESULT_OK)
     }
 
     override fun onBackPressed() {
@@ -229,8 +226,4 @@ open class MainActivity : FragmentActivity() {
             commit()
         }
     }
-
-    private fun setVpnPermission(allow: Boolean) = GlobalScope.launch(Dispatchers.Default) {
-        serviceConnection?.vpnPermission?.grant(allow)
-    }
 }
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/ServiceConnection.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/ServiceConnection.kt
index 4536b4e7ab..6e2cee704f 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/ServiceConnection.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/ServiceConnection.kt
@@ -44,7 +44,6 @@ class ServiceConnection(private val service: ServiceInstance, mainActivity: Main
 
     init {
         appVersionInfoCache.onCreate()
-        service.connectionProxy.mainActivity = mainActivity
         registerListener()
     }
 
@@ -59,7 +58,6 @@ class ServiceConnection(private val service: ServiceInstance, mainActivity: Main
 
         appVersionInfoCache.onDestroy()
         relayListListener.onDestroy()
-        service.connectionProxy.mainActivity = null
     }
 
     private fun registerListener() {