summaryrefslogtreecommitdiffhomepage
path: root/android
diff options
context:
space:
mode:
authorJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2020-11-20 18:48:48 +0000
committerJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2020-11-20 19:14:04 +0000
commit75f82360efa77bda5ca33dd86d4e29406948a6fb (patch)
tree874c02cde8ed8699133dcc77d1ad71362311eb4e /android
parent70da5c302698a16cec6fadc694ebf2abc169e6c0 (diff)
downloadmullvadvpn-75f82360efa77bda5ca33dd86d4e29406948a6fb.tar.xz
mullvadvpn-75f82360efa77bda5ca33dd86d4e29406948a6fb.zip
Mark service reference as `null` when disconnected
Diffstat (limited to 'android')
-rw-r--r--android/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt2
1 files changed, 2 insertions, 0 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 1cb61da920..30b209dc3e 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt
@@ -71,6 +71,7 @@ class MainActivity : FragmentActivity() {
override fun onServiceDisconnected(className: ComponentName) {
android.util.Log.d("mullvad", "UI lost the connection to the service")
service?.serviceNotifier?.unsubscribe(this@MainActivity)
+ service = null
serviceConnection = null
serviceNotifier.notify(null)
}
@@ -123,6 +124,7 @@ class MainActivity : FragmentActivity() {
android.util.Log.d("mullvad", "Stoping main activity")
isUiVisible = false
service?.isUiVisible = false
+ service = null
unbindService(serviceConnectionManager)
super.onStop()