summaryrefslogtreecommitdiffhomepage
path: root/android/src
diff options
context:
space:
mode:
authorJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2020-11-28 23:14:55 +0000
committerJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2020-12-02 13:32:06 +0000
commitbf19e3fef5162d24efda23e092270f312cc9dc69 (patch)
tree515922924b55b2cddc07bd9beac1427bbcd99114 /android/src
parentf417ad737732296bf9ee9b20a050fe2fe55ca3f5 (diff)
downloadmullvadvpn-bf19e3fef5162d24efda23e092270f312cc9dc69.tar.xz
mullvadvpn-bf19e3fef5162d24efda23e092270f312cc9dc69.zip
Allow loading the problem report file
Diffstat (limited to 'android/src')
-rw-r--r--android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/MullvadProblemReport.kt12
1 files changed, 12 insertions, 0 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 12b71d3176..12dd4cd43b 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/MullvadProblemReport.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/MullvadProblemReport.kt
@@ -57,6 +57,18 @@ class MullvadProblemReport {
}
}
+ suspend fun load(): String {
+ if (collectJob == null) {
+ collect()
+ }
+
+ if (collectJob?.await() ?: false) {
+ return problemReportPath.await().readText()
+ } else {
+ return "Failed to collect logs for problem report"
+ }
+ }
+
fun send(): Deferred<Boolean> {
synchronized(this) {
var currentJob = sendJob