summaryrefslogtreecommitdiffhomepage
path: root/android/src
diff options
context:
space:
mode:
authorJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2020-01-29 14:09:49 -0300
committerJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2020-01-29 14:09:49 -0300
commit1b767bf4f65e25afe7a654a432854e343c6a6d00 (patch)
treef534c5a4c28aeca18a330549f7a68e5ce04c7fd3 /android/src
parent84bfdd604187f348dc098461ff41b6a95eab8958 (diff)
parente43865310f96ad9b5f7f81f5924ff680fc5c9b81 (diff)
downloadmullvadvpn-1b767bf4f65e25afe7a654a432854e343c6a6d00.tar.xz
mullvadvpn-1b767bf4f65e25afe7a654a432854e343c6a6d00.zip
Merge branch 'fix-service-notifier-management'
Diffstat (limited to 'android/src')
-rw-r--r--android/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt3
1 files changed, 1 insertions, 2 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 6e0314612e..08137ea93c 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt
@@ -90,14 +90,13 @@ class MainActivity : FragmentActivity() {
}
override fun onStop() {
- serviceNotifier.unsubscribeAll()
-
unbindService(serviceConnectionManager)
super.onStop()
}
override fun onDestroy() {
+ serviceNotifier.unsubscribeAll()
serviceConnection?.onDestroy()
super.onDestroy()