Draff/TachiyomiSY-Plus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup

Browse Source
This commit is contained in:
Jobobby04 2021-07-25 14:15:27 -04:00
parent 1699c2ed67
commit 81af5a5654
2 changed files with 12 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/eu/kanade/tachiyomi/source/online/all/MangaDex.kt
View File

@ -44,7 +44,6 @@ import exh.md.utils.MdUtil
import exh.metadata.metadata.MangaDexSearchMetadata import exh.metadata.metadata.MangaDexSearchMetadata
import exh.source.DelegatedHttpSource import exh.source.DelegatedHttpSource
import exh.ui.metadata.adapters.MangaDexDescriptionAdapter import exh.ui.metadata.adapters.MangaDexDescriptionAdapter
import kotlinx.coroutines.CancellationException
import okhttp3.OkHttpClient import okhttp3.OkHttpClient
import okhttp3.Response import okhttp3.Response
import rx.Observable import rx.Observable

34
app/src/main/java/exh/widget/preference/MangadexLogoutDialog.kt
View File

@ -10,19 +10,17 @@ import eu.kanade.tachiyomi.source.Source
import eu.kanade.tachiyomi.source.SourceManager import eu.kanade.tachiyomi.source.SourceManager
import eu.kanade.tachiyomi.source.online.LoginSource import eu.kanade.tachiyomi.source.online.LoginSource
import eu.kanade.tachiyomi.ui.base.controller.DialogController import eu.kanade.tachiyomi.ui.base.controller.DialogController
import eu.kanade.tachiyomi.util.lang.launchNow import eu.kanade.tachiyomi.util.lang.launchIO
import eu.kanade.tachiyomi.util.lang.withIOContext
import eu.kanade.tachiyomi.util.lang.withUIContext import eu.kanade.tachiyomi.util.lang.withUIContext
import eu.kanade.tachiyomi.util.system.toast import eu.kanade.tachiyomi.util.system.toast
import exh.source.getMainSource import exh.source.getMainSource
import kotlinx.coroutines.supervisorScope
import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.Injekt
import uy.kohesive.injekt.api.get import uy.kohesive.injekt.api.get
import uy.kohesive.injekt.injectLazy import uy.kohesive.injekt.injectLazy
class MangadexLogoutDialog(bundle: Bundle? = null) : DialogController(bundle) { 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() val trackManager: TrackManager by injectLazy()
@ -36,24 +34,16 @@ class MangadexLogoutDialog(bundle: Bundle? = null) : DialogController(bundle) {
return MaterialAlertDialogBuilder(activity!!) return MaterialAlertDialogBuilder(activity!!)
.setTitle(R.string.logout) .setTitle(R.string.logout)
.setPositiveButton(R.string.logout) { _, _ -> .setPositiveButton(R.string.logout) { _, _ ->
launchNow { launchIO {
supervisorScope { if (source.logout()) {
if (source != null) { withUIContext {
val loggedOut = withIOContext { activity?.toast(R.string.logout_success)
source.logout() }
} (targetController as? Listener)?.siteLogoutDialogClosed(source)
} else {
if (loggedOut) { withUIContext {
withUIContext { activity?.toast(R.string.unknown_error)
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") }
} }
} }
} }