Refactor to create `setUpInstance` method

1 files changed, 21 insertions, 17 deletions

diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt
index ed294caf0c..b4ca8f7772 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt
@@ -164,6 +164,27 @@ class MullvadVpnService : TalpidVpnService() {
             }
         }
 
+        setUpInstance(daemon)
+    }
+
+    private fun prepareFiles() {
+        FileMigrator(File("/data/data/net.mullvad.mullvadvpn"), filesDir).apply {
+            migrate(API_ROOT_CA_FILE)
+            migrate(RELAYS_FILE)
+            migrate("settings.json")
+            migrate("daemon.log")
+            migrate("daemon.old.log")
+            migrate("wireguard.log")
+            migrate("wireguard.old.log")
+        }
+
+        FileResourceExtractor(this).apply {
+            extract(API_ROOT_CA_FILE)
+            extract(RELAYS_FILE)
+        }
+    }
+
+    private fun setUpInstance(daemon: MullvadDaemon) {
         val connectionProxy = ConnectionProxy(this@MullvadVpnService, daemon).apply {
             when (pendingAction) {
                 PendingAction.Connect -> connect()
@@ -186,23 +207,6 @@ class MullvadVpnService : TalpidVpnService() {
         )
     }
 
-    private fun prepareFiles() {
-        FileMigrator(File("/data/data/net.mullvad.mullvadvpn"), filesDir).apply {
-            migrate(API_ROOT_CA_FILE)
-            migrate(RELAYS_FILE)
-            migrate("settings.json")
-            migrate("daemon.log")
-            migrate("daemon.old.log")
-            migrate("wireguard.log")
-            migrate("wireguard.old.log")
-        }
-
-        FileResourceExtractor(this).apply {
-            extract(API_ROOT_CA_FILE)
-            extract(RELAYS_FILE)
-        }
-    }
-
     private fun stop() {
         isStopping = true
         stopDaemon()