Merge branch 'fix-bind-handling'

2 files changed, 4 insertions, 9 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1ed5ec05f2..5741f2b9f0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -27,6 +27,7 @@ Line wrap the file at 100 chars.                                              Th
 #### Android
 - Fix crash when that happened sometimes when the app tried to start the daemon service on recent
   Android versions.
+- Fix quitting the app sometimes failing.
 
 
 ## [2020.5-beta1] - 2020-05-18
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt
index 44cbf5ae6f..0cbc994b4f 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt
@@ -58,12 +58,6 @@ class MullvadVpnService : TalpidVpnService() {
             }
         }
 
-    private var bindCount = 0
-        set(value) {
-            field = value
-            isBound = bindCount != 0
-        }
-
     private var isBound = false
         set(value) {
             field = value
@@ -93,13 +87,13 @@ class MullvadVpnService : TalpidVpnService() {
     }
 
     override fun onBind(intent: Intent): IBinder {
-        bindCount += 1
+        isBound = true
 
         return super.onBind(intent) ?: binder
     }
 
     override fun onRebind(intent: Intent) {
-        bindCount += 1
+        isBound = true
 
         if (isStopping) {
             restart()
@@ -112,7 +106,7 @@ class MullvadVpnService : TalpidVpnService() {
     }
 
     override fun onUnbind(intent: Intent): Boolean {
-        bindCount -= 1
+        isBound = false
 
         return true
     }