From 9694c8310ca53216ba8113056168859ccbcca624 Mon Sep 17 00:00:00 2001
From: Jobobby04 <jobobby04@users.noreply.github.com>
Date: Wed, 24 Feb 2021 17:26:08 -0500
Subject: [PATCH] Make sure some toasts are used in the main thread

---
 .../exh/ui/smartsearch/SmartSearchController.kt     | 10 ++++++----
 .../exh/widget/preference/MangadexLoginDialog.kt    | 11 ++++++++---
 .../exh/widget/preference/MangadexLogoutDialog.kt   | 13 ++++++++-----
 3 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/exh/ui/smartsearch/SmartSearchController.kt b/app/src/main/java/exh/ui/smartsearch/SmartSearchController.kt
index bc897919c..07b2a0f88 100644
--- a/app/src/main/java/exh/ui/smartsearch/SmartSearchController.kt
+++ b/app/src/main/java/exh/ui/smartsearch/SmartSearchController.kt
@@ -56,10 +56,12 @@ class SmartSearchController(bundle: Bundle? = null) : NucleusController<EhSmartS
                         router.replaceTopController(transaction)
                     }
                 } else {
-                    if (results is SmartSearchPresenter.SearchResults.NotFound) {
-                        applicationContext?.toast("Couldn't find the manga in the source!")
-                    } else {
-                        applicationContext?.toast("Error performing automatic search!")
+                    withUIContext {
+                        if (results is SmartSearchPresenter.SearchResults.NotFound) {
+                            applicationContext?.toast("Couldn't find the manga in the source!")
+                        } else {
+                            applicationContext?.toast("Error performing automatic search!")
+                        }
                     }
 
                     val transaction = BrowseSourceController(source, smartSearchConfig.origTitle, smartSearchConfig).withFadeTransaction()
diff --git a/app/src/main/java/exh/widget/preference/MangadexLoginDialog.kt b/app/src/main/java/exh/widget/preference/MangadexLoginDialog.kt
index b72ec1f1d..82f2bf8bd 100644
--- a/app/src/main/java/exh/widget/preference/MangadexLoginDialog.kt
+++ b/app/src/main/java/exh/widget/preference/MangadexLoginDialog.kt
@@ -18,6 +18,7 @@ import eu.kanade.tachiyomi.source.Source
 import eu.kanade.tachiyomi.source.SourceManager
 import eu.kanade.tachiyomi.source.online.all.MangaDex
 import eu.kanade.tachiyomi.ui.base.controller.DialogController
+import eu.kanade.tachiyomi.util.lang.launchUI
 import eu.kanade.tachiyomi.util.system.toast
 import exh.source.getMainSource
 import kotlinx.coroutines.CoroutineScope
@@ -79,7 +80,9 @@ class MangadexLoginDialog(bundle: Bundle? = null) : DialogController(bundle) {
         val twoFactor = binding.twoFactorEdit.text?.toString()
         if (username.isNullOrBlank() || password.isNullOrBlank() || (binding.twoFactorCheck.isChecked && twoFactor.isNullOrBlank())) {
             errorResult()
-            binding.root.context.toast(R.string.fields_cannot_be_blank)
+            launchUI {
+                binding.root.context.toast(R.string.fields_cannot_be_blank)
+            }
             return
         }
 
@@ -98,13 +101,15 @@ class MangadexLoginDialog(bundle: Bundle? = null) : DialogController(bundle) {
                 if (result) {
                     dialog?.dismiss()
                     preferences.setTrackCredentials(service, username, password)
-                    binding.root.context.toast(R.string.login_success)
+                    launchUI {
+                        binding.root.context.toast(R.string.login_success)
+                    }
                 } else {
                     errorResult()
                 }
             } catch (error: Exception) {
                 errorResult()
-                error.message?.let { binding.root.context.toast(it) }
+                error.message?.let { launchUI { binding.root.context.toast(it) } }
             }
         }
     }
diff --git a/app/src/main/java/exh/widget/preference/MangadexLogoutDialog.kt b/app/src/main/java/exh/widget/preference/MangadexLogoutDialog.kt
index 801843bb4..29b180062 100644
--- a/app/src/main/java/exh/widget/preference/MangadexLogoutDialog.kt
+++ b/app/src/main/java/exh/widget/preference/MangadexLogoutDialog.kt
@@ -11,6 +11,7 @@ import eu.kanade.tachiyomi.source.SourceManager
 import eu.kanade.tachiyomi.source.online.all.MangaDex
 import eu.kanade.tachiyomi.ui.base.controller.DialogController
 import eu.kanade.tachiyomi.util.lang.launchNow
+import eu.kanade.tachiyomi.util.lang.launchUI
 import eu.kanade.tachiyomi.util.lang.withIOContext
 import eu.kanade.tachiyomi.util.system.toast
 import exh.source.getMainSource
@@ -53,13 +54,15 @@ class MangadexLogoutDialog(bundle: Bundle? = null) : DialogController(bundle) {
                                 activity?.toast(R.string.logout_success)
                                 (targetController as? Listener)?.siteLogoutDialogClosed(source)
                             } else {
-                                if (exception != null) {
-                                    activity?.toast(exception.message)
-                                } else {
-                                    activity?.toast(R.string.unknown_error)
+                                launchUI {
+                                    if (exception != null) {
+                                        activity?.toast(exception.message)
+                                    } else {
+                                        activity?.toast(R.string.unknown_error)
+                                    }
                                 }
                             }
-                        } else activity?.toast("Mangadex not enabled")
+                        } else launchUI { activity?.toast("Mangadex not enabled") }
                     }
                 }
             }