diff options
| author | David Lönnhager <david.l@mullvad.net> | 2021-01-04 16:51:07 +0100 |
|---|---|---|
| committer | David Lönnhager <david.l@mullvad.net> | 2021-01-04 16:51:07 +0100 |
| commit | 9cfad3027adea59fa26e4c610d5a0ad41e5743ed (patch) | |
| tree | f3d08577213319b78483adaa33646649fa154ce0 /android/src | |
| parent | 1680065e267b84f1443317ae942cd0c609e86b14 (diff) | |
| parent | a2379f2b5eb7a79cd0a05f63692207674e9fabd5 (diff) | |
| download | mullvadvpn-9cfad3027adea59fa26e4c610d5a0ad41e5743ed.tar.xz mullvadvpn-9cfad3027adea59fa26e4c610d5a0ad41e5743ed.zip | |
Merge branch 'unblock-api-ip'
Diffstat (limited to 'android/src')
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/MullvadProblemReport.kt | 6 | ||||
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt | 2 |
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) |