diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-02-12 15:16:06 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-02-13 10:49:32 +0000 |
| commit | 4ca331577bd4379ae915b37fa0d6f009b29fb9ac (patch) | |
| tree | 00f0b5a3eb34b42566929d45b6b3f87d4e4490db /android | |
| parent | 37aa0f207122158269de28f373416fa5ff56b7b9 (diff) | |
| download | mullvadvpn-4ca331577bd4379ae915b37fa0d6f009b29fb9ac.tar.xz mullvadvpn-4ca331577bd4379ae915b37fa0d6f009b29fb9ac.zip | |
Extract `relays.json` resource
Diffstat (limited to 'android')
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt | 6 |
1 files changed, 6 insertions, 0 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 5768a21a52..cdfdbac287 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt @@ -15,6 +15,9 @@ 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) @@ -116,6 +119,9 @@ class MullvadVpnService : TalpidVpnService() { 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 -> notificationManager.loggedIn = settings?.accountToken != null |