Refactor `FileResourceExtractor`

2 files changed, 8 insertions, 6 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 e1fb9537b8..1ab65fa850 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/FileResourceExtractor.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/FileResourceExtractor.kt
@@ -4,16 +4,16 @@ import android.content.Context
 import java.io.File
 import java.io.FileOutputStream
 
-class FileResourceExtractor(val asset: String) {
-    fun extract(context: Context) {
+class FileResourceExtractor(val context: Context) {
+    fun extract(asset: String) {
         val destination = File(context.filesDir, asset)
 
         if (!destination.exists()) {
-            extractFile(context, destination)
+            extractFile(asset, destination)
         }
     }
 
-    private fun extractFile(context: Context, destination: File) {
+    private fun extractFile(asset: String, 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 3e8aeac8ff..36bdb65836 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt
@@ -185,8 +185,10 @@ class MullvadVpnService : TalpidVpnService() {
     }
 
     private fun prepareFiles() {
-        FileResourceExtractor(API_ROOT_CA_FILE).extract(application)
-        FileResourceExtractor(RELAYS_FILE).extract(application)
+        FileResourceExtractor(this).apply {
+            extract(API_ROOT_CA_FILE)
+            extract(RELAYS_FILE)
+        }
     }
 
     private fun stop() {