diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-11-23 20:56:43 -0300 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-11-23 20:56:43 -0300 |
| commit | 5defb1532bc8cbed76cc3ff259deaf0627a8106f (patch) | |
| tree | a79721e8b32193f9a4c8e6494f76a2ec0a43d35d | |
| parent | f6cc8319c978ef4a2caf23c626e39ebcdb21529f (diff) | |
| parent | bce694d28e008d7fa32feec3dc723abf8778d7b1 (diff) | |
| download | mullvadvpn-5defb1532bc8cbed76cc3ff259deaf0627a8106f.tar.xz mullvadvpn-5defb1532bc8cbed76cc3ff259deaf0627a8106f.zip | |
Merge branch 'fix-missing-api-ip-address-file'
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt | 2 | ||||
| -rwxr-xr-x | build-apk.sh | 1 |
2 files changed, 3 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 1642020b86..f7eba5c1da 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt @@ -21,6 +21,7 @@ import net.mullvad.mullvadvpn.ui.MainActivity import net.mullvad.talpid.TalpidVpnService import net.mullvad.talpid.util.EventNotifier +private const val API_IP_ADDRESS_FILE = "api-ip-address.txt" private const val RELAYS_FILE = "relays.json" class MullvadVpnService : TalpidVpnService() { @@ -239,6 +240,7 @@ class MullvadVpnService : TalpidVpnService() { lastUpdatedTime() > File(filesDir, RELAYS_FILE).lastModified() FileResourceExtractor(this).apply { + extract(API_IP_ADDRESS_FILE, false) extract(RELAYS_FILE, shouldOverwriteRelayList) } } diff --git a/build-apk.sh b/build-apk.sh index 764f3a8de2..8dd49ceb60 100755 --- a/build-apk.sh +++ b/build-apk.sh @@ -119,6 +119,7 @@ for ARCHITECTURE in $ARCHITECTURES; do done ./update-relays.sh +./update-api-address.sh cd "$SCRIPT_DIR/android" $GRADLE_CMD --console plain "$GRADLE_TASK" |