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