Stop daemon earlier

1 files changed, 1 insertions, 6 deletions

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 c1502fc300..6e0314612e 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt
@@ -26,7 +26,6 @@ class MainActivity : FragmentActivity() {
     private var serviceConnection: ServiceConnection? = null
     private var serviceConnectionSubscription: Int? = null
     private var shouldConnect = false
-    private var shouldStopService = false
 
     private val serviceConnectionManager = object : android.content.ServiceConnection {
         override fun onServiceConnected(className: ComponentName, binder: IBinder) {
@@ -93,10 +92,6 @@ class MainActivity : FragmentActivity() {
     override fun onStop() {
         serviceNotifier.unsubscribeAll()
 
-        if (shouldStopService) {
-            service?.apply { stop() }
-        }
-
         unbindService(serviceConnectionManager)
 
         super.onStop()
@@ -134,7 +129,7 @@ class MainActivity : FragmentActivity() {
     }
 
     fun quit() {
-        shouldStopService = true
+        service?.stop()
         finishAndRemoveTask()
     }