diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-11-23 21:31:07 -0300 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-11-23 21:31:07 -0300 |
| commit | 44bd239dcb61e7c8fb773c875f79819e0755dca7 (patch) | |
| tree | 004300c8a7ee805b6a3a9992907715adc6d38446 /android/src | |
| parent | 5defb1532bc8cbed76cc3ff259deaf0627a8106f (diff) | |
| parent | d8ff9aa58ab13f40cc69dbba673d97265c5f8a44 (diff) | |
| download | mullvadvpn-44bd239dcb61e7c8fb773c875f79819e0755dca7.tar.xz mullvadvpn-44bd239dcb61e7c8fb773c875f79819e0755dca7.zip | |
Merge branch 'fix-sending-problem-reports'
Diffstat (limited to 'android/src')
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/MullvadProblemReport.kt | 7 | ||||
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt | 5 |
2 files changed, 9 insertions, 3 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 4bbc29c8c3..bebac103d7 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/MullvadProblemReport.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/MullvadProblemReport.kt @@ -13,6 +13,7 @@ const val PROBLEM_REPORT_FILE = "problem_report.txt" class MullvadProblemReport { val logDirectory = CompletableDeferred<File>() + val resourcesDirectory = CompletableDeferred<File>() private val problemReportPath = GlobalScope.async(Dispatchers.Default) { File(logDirectory.await(), PROBLEM_REPORT_FILE) @@ -66,7 +67,8 @@ class MullvadProblemReport { sendProblemReport( userEmail, userMessage, - problemReportPath.await().absolutePath + problemReportPath.await().absolutePath, + resourcesDirectory.await().absolutePath ) if (result) { @@ -102,6 +104,7 @@ class MullvadProblemReport { private external fun sendProblemReport( userEmail: String, userMessage: String, - reportPath: String + reportPath: String, + resourcesDirectory: 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 0128df069a..a7a6f3dbef 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt @@ -84,7 +84,10 @@ class MainActivity : FragmentActivity() { super.onCreate(savedInstanceState) - problemReport.logDirectory.complete(filesDir) + problemReport.apply { + logDirectory.complete(filesDir) + resourcesDirectory.complete(filesDir) + } setContentView(R.layout.main) |