Merge branch 'bundle-relay-list-in-apk'

2 files changed, 15 insertions, 8 deletions

diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/ApiRootCaFile.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/FileResourceExtractor.kt
index 0322d767a0..aac6175ec6 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/ApiRootCaFile.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/FileResourceExtractor.kt
@@ -4,17 +4,14 @@ import android.content.Context
 import java.io.File
 import java.io.FileOutputStream
 
-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"
-
-class ApiRootCaFile {
+class FileResourceExtractor(val asset: String, val destination: String) {
     fun extract(context: Context) {
-        if (!File(API_ROOT_CA_PATH).exists()) {
-            extractFile(context, API_ROOT_CA_FILE, API_ROOT_CA_PATH)
+        if (!File(destination).exists()) {
+            extractFile(context)
         }
     }
 
-    private fun extractFile(context: Context, asset: String, destination: String) {
+    private fun extractFile(context: Context) {
         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 b903d35045..cdfdbac287 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt
@@ -12,6 +12,12 @@ import net.mullvad.mullvadvpn.dataproxy.ConnectionProxy
 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 val binder = LocalBinder()
     private val serviceNotifier = EventNotifier<ServiceInstance?>(null)
@@ -110,7 +116,11 @@ class MullvadVpnService : TalpidVpnService() {
     }
 
     private fun startDaemon() = GlobalScope.launch(Dispatchers.Default) {
-        ApiRootCaFile().extract(application)
+        FileResourceExtractor(API_ROOT_CA_FILE, API_ROOT_CA_PATH)
+            .extract(application)
+
+        FileResourceExtractor(RELAYS_FILE, RELAYS_PATH)
+            .extract(application)
 
         val newDaemon = MullvadDaemon(this@MullvadVpnService).apply {
             onSettingsChange.subscribe { settings ->