summaryrefslogtreecommitdiffhomepage
path: root/android/src/main
diff options
context:
space:
mode:
authorDavid Lönnhager <david.l@mullvad.net>2020-12-02 17:36:39 +0100
committerDavid Lönnhager <david.l@mullvad.net>2021-01-04 16:50:18 +0100
commit29260429f5cdf04ef4e51a42a4abd11f5e2e03b7 (patch)
tree35db7806efabbf85c79cc919dc2fea07f30578ff /android/src/main
parent1680065e267b84f1443317ae942cd0c609e86b14 (diff)
downloadmullvadvpn-29260429f5cdf04ef4e51a42a4abd11f5e2e03b7.tar.xz
mullvadvpn-29260429f5cdf04ef4e51a42a4abd11f5e2e03b7.zip
Always prefer the last used API address
Diffstat (limited to 'android/src/main')
-rw-r--r--android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/MullvadProblemReport.kt6
-rw-r--r--android/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt2
2 files changed, 4 insertions, 4 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/MullvadProblemReport.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/MullvadProblemReport.kt
index ae2d1b2df2..52795f0964 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/MullvadProblemReport.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/MullvadProblemReport.kt
@@ -22,7 +22,7 @@ class MullvadProblemReport {
}
val logDirectory = CompletableDeferred<File>()
- val resourcesDirectory = CompletableDeferred<File>()
+ val cacheDirectory = CompletableDeferred<File>()
private val commandChannel = spawnActor()
@@ -112,7 +112,7 @@ class MullvadProblemReport {
userEmail,
userMessage,
problemReportPath.await().absolutePath,
- resourcesDirectory.await().absolutePath
+ cacheDirectory.await().absolutePath
)
if (result) {
@@ -132,6 +132,6 @@ class MullvadProblemReport {
userEmail: String,
userMessage: String,
reportPath: String,
- resourcesDirectory: String
+ cacheDirectory: String
): Boolean
}
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt
index 44996b55b8..613927fe49 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt
@@ -88,7 +88,7 @@ class MainActivity : FragmentActivity() {
problemReport.apply {
logDirectory.complete(filesDir)
- resourcesDirectory.complete(filesDir)
+ cacheDirectory.complete(cacheDir)
}
setContentView(R.layout.main)