diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-09-12 11:38:43 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-09-13 12:14:20 +0000 |
| commit | 583df144f39545ee0a8b9eff6ef453d248c54bba (patch) | |
| tree | 1f3973ea98096a9d66a16ea5273b2ec3fa6c9181 /android/src | |
| parent | bedc2dce8abbf966086a4f81233cfb65685a1ec5 (diff) | |
| download | mullvadvpn-583df144f39545ee0a8b9eff6ef453d248c54bba.tar.xz mullvadvpn-583df144f39545ee0a8b9eff6ef453d248c54bba.zip | |
Create `MullvadVpnService::tearDown` helper method
Diffstat (limited to 'android/src')
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/MullvadVpnService.kt | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/MullvadVpnService.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/MullvadVpnService.kt index 02e8be5e2c..94c169604b 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/MullvadVpnService.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/MullvadVpnService.kt @@ -36,9 +36,7 @@ class MullvadVpnService : VpnService() { } override fun onDestroy() { - connectionProxy.onDestroy() - notificationManager.onDestroy() - versionInfoFetcher.stop() + tearDown() daemon.cancel() created.cancel() } @@ -98,4 +96,10 @@ class MullvadVpnService : VpnService() { ApiRootCaFile().extract(application) MullvadDaemon(this@MullvadVpnService) } + + private fun tearDown() { + connectionProxy.onDestroy() + notificationManager.onDestroy() + versionInfoFetcher.stop() + } } |