From 149c6be1bfd4bd84381757940fece1be7b9801aa Mon Sep 17 00:00:00 2001
From: Allan Wang <me@allanwang.ca>
Date: Mon, 31 Dec 2018 18:57:28 -0500
Subject: Enhancement/coroutines (#1273)

* Convert rest of fbcookie to suspended methods

* Replace active checks with yield

* Apply spotless

* Switch cookie domain to exact url

* Optimize imports and enable travis tests again

* Update proguard rules

* Remove unnecessary yield

* Remove unused flyweight

* Remove unused disposable and method

* Use contexthelper instead of dispatcher main

* Convert login activity to coroutines

* Use kau helper methods for coroutines

* Enhancement/offline site (#1288)

* Begin conversion of offline site logic

* Fix offline tests and add validation tests

* Ignore cookie in jsoup if it is blank

* Force load and zip to be in io

* Use different zip files to fix tests

* Log all test output

* Do not log stdout

* Allow test skip for fb offline
---
 .../kotlin/com/pitchedapps/frost/settings/Debug.kt | 51 +++++++++++-----------
 1 file changed, 25 insertions(+), 26 deletions(-)

(limited to 'app/src/main/kotlin/com/pitchedapps/frost/settings/Debug.kt')

diff --git a/app/src/main/kotlin/com/pitchedapps/frost/settings/Debug.kt b/app/src/main/kotlin/com/pitchedapps/frost/settings/Debug.kt
index ece1f677..08f13a10 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/settings/Debug.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/settings/Debug.kt
@@ -18,10 +18,12 @@ package com.pitchedapps.frost.settings
 
 import android.content.Context
 import ca.allanwang.kau.kpref.activity.KPrefAdapterBuilder
+import ca.allanwang.kau.utils.launchMain
 import ca.allanwang.kau.utils.materialDialog
 import ca.allanwang.kau.utils.startActivityForResult
 import ca.allanwang.kau.utils.string
 import ca.allanwang.kau.utils.toast
+import ca.allanwang.kau.utils.withMainContext
 import com.pitchedapps.frost.R
 import com.pitchedapps.frost.activities.DebugActivity
 import com.pitchedapps.frost.activities.SettingsActivity
@@ -39,9 +41,7 @@ import com.pitchedapps.frost.utils.sendFrostEmail
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.channels.Channel
-import kotlinx.coroutines.isActive
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
 import java.io.File
 
 /**
@@ -87,9 +87,7 @@ fun SettingsActivity.getDebugPrefs(): KPrefAdapterBuilder.() -> Unit = {
                     attempt = launch(Dispatchers.IO) {
                         try {
                             val data = parser.parse(FbCookie.webCookie)
-                            withContext(Dispatchers.Main) {
-                                if (!isActive)
-                                    return@withContext
+                            withMainContext {
                                 loading.dismiss()
                                 createEmail(parser, data?.data)
                             }
@@ -120,43 +118,44 @@ fun SettingsActivity.sendDebug(url: String, html: String?) {
         baseDir = DebugActivity.baseDir(this)
     )
 
+    val job = Job()
+
     val md = materialDialog {
         title(R.string.parsing_data)
         progress(false, 100)
         negativeText(R.string.kau_cancel)
         onNegative { dialog, _ -> dialog.dismiss() }
         canceledOnTouchOutside(false)
-        dismissListener { downloader.cancel() }
+        dismissListener { job.cancel() }
     }
 
     val progressChannel = Channel<Int>(10)
 
-    launch(Dispatchers.Main) {
+    launchMain {
         for (p in progressChannel) {
             md.setProgress(p)
         }
     }
-    launch(Dispatchers.IO) {
-        downloader.loadAndZip(ZIP_NAME, { progressChannel.offer(it) }) { success ->
-            launch(Dispatchers.Main) {
-                if (!isActive) return@launch
-                md.dismiss()
-                if (success) {
-                    val zipUri = frostUriFromFile(
-                        File(downloader.baseDir, "$ZIP_NAME.zip")
-                    )
-                    L.i { "Sending debug zip with uri $zipUri" }
-                    sendFrostEmail(R.string.debug_report_email_title) {
-                        addItem("Url", url)
-                        addAttachment(zipUri)
-                        extras = {
-                            type = "application/zip"
-                        }
-                    }
-                } else {
-                    toast(R.string.error_generic)
+
+    launchMain {
+        val success = downloader.loadAndZip(ZIP_NAME) {
+            progressChannel.offer(it)
+        }
+        md.dismiss()
+        if (success) {
+            val zipUri = frostUriFromFile(
+                File(downloader.baseDir, "$ZIP_NAME.zip")
+            )
+            L.i { "Sending debug zip with uri $zipUri" }
+            sendFrostEmail(R.string.debug_report_email_title) {
+                addItem("Url", url)
+                addAttachment(zipUri)
+                extras = {
+                    type = "application/zip"
                 }
             }
+        } else {
+            toast(R.string.error_generic)
         }
     }
 }
-- 
cgit v1.2.3