summaryrefslogtreecommitdiffhomepage
path: root/android
diff options
context:
space:
mode:
authorDavid Lönnhager <david.l@mullvad.net>2022-03-01 15:31:52 +0100
committerDavid Lönnhager <david.l@mullvad.net>2022-03-01 15:31:52 +0100
commit8e601e3145c558ab80a5e2f4310977f26e402183 (patch)
treeeeed77609088bbc08330066192428bf5bfd83a6c /android
parent710b361a8c209dc670f2d459eacd2d6ad3661156 (diff)
parent63b6585cd02693dedc4ce41598407131cbb9d93f (diff)
downloadmullvadvpn-8e601e3145c558ab80a5e2f4310977f26e402183.tar.xz
mullvadvpn-8e601e3145c558ab80a5e2f4310977f26e402183.zip
Merge branch 'proxy-api-reqs'
Diffstat (limited to 'android')
-rw-r--r--android/app/build.gradle.kts1
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/service/DaemonInstance.kt2
2 files changed, 0 insertions, 3 deletions
diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts
index 7fa36a9986..dd7d97d1ec 100644
--- a/android/app/build.gradle.kts
+++ b/android/app/build.gradle.kts
@@ -128,7 +128,6 @@ tasks.withType<KotlinCompile>().all {
tasks.register("copyExtraAssets", Copy::class) {
from("$repoRootPath/dist-assets")
include("relays.json")
- include("api-ip-address.txt")
into(extraAssetsDirectory)
}
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/service/DaemonInstance.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/service/DaemonInstance.kt
index 23b127addf..8b900038fc 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/service/DaemonInstance.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/service/DaemonInstance.kt
@@ -11,7 +11,6 @@ import kotlinx.coroutines.channels.actor
import kotlinx.coroutines.channels.sendBlocking
import net.mullvad.mullvadvpn.util.Intermittent
-private const val API_IP_ADDRESS_FILE = "api-ip-address.txt"
private const val RELAYS_FILE = "relays.json"
class DaemonInstance(val vpnService: MullvadVpnService) {
@@ -88,7 +87,6 @@ class DaemonInstance(val vpnService: MullvadVpnService) {
lastUpdatedTime() > File(vpnService.filesDir, RELAYS_FILE).lastModified()
FileResourceExtractor(vpnService).apply {
- extract(API_IP_ADDRESS_FILE, false)
extract(RELAYS_FILE, shouldOverwriteRelayList)
}
}