diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2021-04-29 08:34:07 -0300 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2021-04-29 08:34:07 -0300 |
| commit | 07365311121b34f5dc4d49568ec652b2e3317b15 (patch) | |
| tree | 5e3fc89246a487fd796a04de32750053eebaf90e /android/src | |
| parent | b45459236d1832e944885963cee37d81033139eb (diff) | |
| parent | f346f03f2cdbd8896bc4fdc5ef7443c271863688 (diff) | |
| download | mullvadvpn-07365311121b34f5dc4d49568ec652b2e3317b15.tar.xz mullvadvpn-07365311121b34f5dc4d49568ec652b2e3317b15.zip | |
Merge branch 'fix-service-connection-destruction'
Diffstat (limited to 'android/src')
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt | 3 |
1 files changed, 2 insertions, 1 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 5bf6a1b8f7..7f3f4de4a8 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt @@ -55,7 +55,6 @@ open class MainActivity : FragmentActivity() { override fun onServiceDisconnected(className: ComponentName) { android.util.Log.d("mullvad", "UI lost the connection to the service") serviceConnection = null - serviceNotifier.notify(null) } } @@ -115,6 +114,8 @@ open class MainActivity : FragmentActivity() { unbindService(serviceConnectionManager) super.onStop() + + serviceConnection = null } override fun onDestroy() { |