diff options
| author | Emīls <emils@mullvad.net> | 2020-04-28 12:27:28 +0100 |
|---|---|---|
| committer | Emīls <emils@mullvad.net> | 2020-04-28 12:30:42 +0100 |
| commit | 03029aedbc33bb1ddbda6f545f771aeb092e9bd0 (patch) | |
| tree | 13668f25f374dac5574caaac9c513a70e4279c8f /android/src/main | |
| parent | e1a1f1206cf7f7dfc7220c2d8c4abad36b6620d0 (diff) | |
| download | mullvadvpn-03029aedbc33bb1ddbda6f545f771aeb092e9bd0.tar.xz mullvadvpn-03029aedbc33bb1ddbda6f545f771aeb092e9bd0.zip | |
Pass resource directory to problem report
Diffstat (limited to 'android/src/main')
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/MullvadProblemReport.kt | 8 | ||||
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt | 2 |
2 files changed, 6 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 66a55503d6..4c291bbc10 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/MullvadProblemReport.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/MullvadProblemReport.kt @@ -9,7 +9,7 @@ import kotlinx.coroutines.async const val PROBLEM_REPORT_FILE = "problem_report.txt" -class MullvadProblemReport(val logDirectory: File) { +class MullvadProblemReport(val logDirectory: File, val resourceDirectory: File) { private val problemReportPath = File(logDirectory, PROBLEM_REPORT_FILE) private var collectJob: Deferred<Boolean>? = null @@ -56,7 +56,8 @@ class MullvadProblemReport(val logDirectory: File) { sendProblemReport( userEmail, userMessage, - problemReportPath.absolutePath + problemReportPath.absolutePath, + resourceDirectory.absolutePath ) if (result) { @@ -81,6 +82,7 @@ class MullvadProblemReport(val logDirectory: File) { private external fun sendProblemReport( userEmail: String, userMessage: String, - reportPath: String + reportPath: String, + resourceDir: 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 524d4ab00d..60356f4b20 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt @@ -66,7 +66,7 @@ class MainActivity : FragmentActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - problemReport = MullvadProblemReport(filesDir) + problemReport = MullvadProblemReport(filesDir, filesDir) setContentView(R.layout.main) |