Load and show problem report in View Logs screen

1 files changed, 31 insertions, 0 deletions

diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ViewLogsFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ViewLogsFragment.kt
index 1355563e38..30a81111b9 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ViewLogsFragment.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ViewLogsFragment.kt
@@ -6,9 +6,26 @@ import android.support.v4.app.Fragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.EditText
 import net.mullvad.mullvadvpn.R
+import net.mullvad.mullvadvpn.dataproxy.MullvadProblemReport
+import net.mullvad.mullvadvpn.util.JobTracker
 
 class ViewLogsFragment : Fragment() {
+    private val jobTracker = JobTracker()
+
+    private lateinit var problemReport: MullvadProblemReport
+
+    private lateinit var logArea: EditText
+
+    override fun onAttach(context: Context) {
+        super.onAttach(context)
+
+        val parentActivity = context as MainActivity
+
+        problemReport = parentActivity.problemReport
+    }
+
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
@@ -20,6 +37,20 @@ class ViewLogsFragment : Fragment() {
             activity?.onBackPressed()
         }
 
+        logArea = view.findViewById<EditText>(R.id.log_area)
+
         return view
     }
+
+    override fun onStart() {
+        super.onStart()
+
+        jobTracker.newUiJob("showLogs") {
+            val logs = jobTracker.runOnBackground {
+                problemReport.load()
+            }
+
+            logArea.setText(logs)
+        }
+    }
 }