2 files changed, 8 insertions, 12 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/FileResourceExtractor.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/FileResourceExtractor.kt
index aac6175ec6..e1fb9537b8 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/FileResourceExtractor.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/FileResourceExtractor.kt
@@ -4,14 +4,16 @@ import android.content.Context
 import java.io.File
 import java.io.FileOutputStream
 
-class FileResourceExtractor(val asset: String, val destination: String) {
+class FileResourceExtractor(val asset: String) {
     fun extract(context: Context) {
-        if (!File(destination).exists()) {
-            extractFile(context)
+        val destination = File(context.filesDir, asset)
+
+        if (!destination.exists()) {
+            extractFile(context, destination)
         }
     }
 
-    private fun extractFile(context: Context) {
+    private fun extractFile(context: Context, destination: File) {
         val destinationStream = FileOutputStream(destination)
 
         context
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 4df3ff6791..1cd3fcc8b3 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt
@@ -14,10 +14,7 @@ import net.mullvad.talpid.TalpidVpnService
 import net.mullvad.talpid.util.EventNotifier
 
 private const val API_ROOT_CA_FILE = "api_root_ca.pem"
-private const val API_ROOT_CA_PATH = "/data/data/net.mullvad.mullvadvpn/api_root_ca.pem"
-
 private const val RELAYS_FILE = "relays.json"
-private const val RELAYS_PATH = "/data/data/net.mullvad.mullvadvpn/relays.json"
 
 class MullvadVpnService : TalpidVpnService() {
     private enum class PendingAction {
@@ -144,11 +141,8 @@ class MullvadVpnService : TalpidVpnService() {
     }
 
     private fun startDaemon() = GlobalScope.launch(Dispatchers.Default) {
-        FileResourceExtractor(API_ROOT_CA_FILE, API_ROOT_CA_PATH)
-            .extract(application)
-
-        FileResourceExtractor(RELAYS_FILE, RELAYS_PATH)
-            .extract(application)
+        FileResourceExtractor(API_ROOT_CA_FILE).extract(application)
+        FileResourceExtractor(RELAYS_FILE).extract(application)
 
         val newDaemon = MullvadDaemon(this@MullvadVpnService).apply {
             onSettingsChange.subscribe { settings ->