Only unsubscribe listeners if destroying activity

Previously, `MainActivity` would unsubscribe all service listeners when
it was stopping (i.e., going to the background). However, that meant
that once it resumed all UI fragments that were sub-classes of
`ServiceAwareFragment` would still reference the old service, which
might have been stopped or replaced, and wouldn't receive any updates if
the service connection is dropped or replaced.

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()