From 81af5a5654f43fc2fa066d1f507679e1497c6c2d Mon Sep 17 00:00:00 2001
From: Jobobby04 <jobobby04@users.noreply.github.com>
Date: Sun, 25 Jul 2021 14:15:27 -0400
Subject: [PATCH] Cleanup

---
 .../tachiyomi/source/online/all/MangaDex.kt   |  1 -
 .../widget/preference/MangadexLogoutDialog.kt | 34 +++++++------------
 2 files changed, 12 insertions(+), 23 deletions(-)

diff --git a/app/src/main/java/eu/kanade/tachiyomi/source/online/all/MangaDex.kt b/app/src/main/java/eu/kanade/tachiyomi/source/online/all/MangaDex.kt
index a71e89226..57dac775d 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/source/online/all/MangaDex.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/source/online/all/MangaDex.kt
@@ -44,7 +44,6 @@ import exh.md.utils.MdUtil
 import exh.metadata.metadata.MangaDexSearchMetadata
 import exh.source.DelegatedHttpSource
 import exh.ui.metadata.adapters.MangaDexDescriptionAdapter
-import kotlinx.coroutines.CancellationException
 import okhttp3.OkHttpClient
 import okhttp3.Response
 import rx.Observable
diff --git a/app/src/main/java/exh/widget/preference/MangadexLogoutDialog.kt b/app/src/main/java/exh/widget/preference/MangadexLogoutDialog.kt
index 02d467c87..b63186165 100644
--- a/app/src/main/java/exh/widget/preference/MangadexLogoutDialog.kt
+++ b/app/src/main/java/exh/widget/preference/MangadexLogoutDialog.kt
@@ -10,19 +10,17 @@ import eu.kanade.tachiyomi.source.Source
 import eu.kanade.tachiyomi.source.SourceManager
 import eu.kanade.tachiyomi.source.online.LoginSource
 import eu.kanade.tachiyomi.ui.base.controller.DialogController
-import eu.kanade.tachiyomi.util.lang.launchNow
-import eu.kanade.tachiyomi.util.lang.withIOContext
+import eu.kanade.tachiyomi.util.lang.launchIO
 import eu.kanade.tachiyomi.util.lang.withUIContext
 import eu.kanade.tachiyomi.util.system.toast
 import exh.source.getMainSource
-import kotlinx.coroutines.supervisorScope
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 import uy.kohesive.injekt.injectLazy
 
 class MangadexLogoutDialog(bundle: Bundle? = null) : DialogController(bundle) {
 
-    val source = Injekt.get<SourceManager>().get(args.getLong("key", 0))?.getMainSource() as? LoginSource
+    val source = Injekt.get<SourceManager>().get(args.getLong("key", 0))?.getMainSource() as LoginSource
 
     val trackManager: TrackManager by injectLazy()
 
@@ -36,24 +34,16 @@ class MangadexLogoutDialog(bundle: Bundle? = null) : DialogController(bundle) {
         return MaterialAlertDialogBuilder(activity!!)
             .setTitle(R.string.logout)
             .setPositiveButton(R.string.logout) { _, _ ->
-                launchNow {
-                    supervisorScope {
-                        if (source != null) {
-                            val loggedOut = withIOContext {
-                                source.logout()
-                            }
-
-                            if (loggedOut) {
-                                withUIContext {
-                                    activity?.toast(R.string.logout_success)
-                                }
-                                (targetController as? Listener)?.siteLogoutDialogClosed(source)
-                            } else {
-                                withUIContext {
-                                    activity?.toast(R.string.unknown_error)
-                                }
-                            }
-                        } else withUIContext { activity?.toast("Mangadex not enabled") }
+                launchIO {
+                    if (source.logout()) {
+                        withUIContext {
+                            activity?.toast(R.string.logout_success)
+                        }
+                        (targetController as? Listener)?.siteLogoutDialogClosed(source)
+                    } else {
+                        withUIContext {
+                            activity?.toast(R.string.unknown_error)
+                        }
                     }
                 }
             }