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

Remove some usages of global scope

Browse Source 
(cherry picked from commit 8efb20439a3d06766f257227f68bf1b762f9c432)
This commit is contained in:
arkon 2022-08-29 15:15:18 -04:00 committed by Jobobby04
parent ae64f9fabd
commit f5fd4526d3
5 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceController.kt
View File

@ -784,7 +784,7 @@ open class BrowseSourceController(bundle: Bundle) :
override fun onItemLongClick(position: Int) { override fun onItemLongClick(position: Int) {
val activity = activity ?: return val activity = activity ?: return
val manga = (adapter?.getItem(position) as? SourceItem?)?.manga ?: return val manga = (adapter?.getItem(position) as? SourceItem?)?.manga ?: return
launchIO { viewScope.launchIO {
val duplicateManga = presenter.getDuplicateLibraryManga(manga) val duplicateManga = presenter.getDuplicateLibraryManga(manga)
withUIContext { withUIContext {
@ -820,7 +820,7 @@ open class BrowseSourceController(bundle: Bundle) :
private fun addToLibrary(newManga: Manga, position: Int) { private fun addToLibrary(newManga: Manga, position: Int) {
val activity = activity ?: return val activity = activity ?: return
launchIO { viewScope.launchIO {
val categories = presenter.getCategories() val categories = presenter.getCategories()
val defaultCategoryId = preferences.defaultCategory() val defaultCategoryId = preferences.defaultCategory()
val defaultCategory = categories.find { it.id == defaultCategoryId.toLong() } val defaultCategory = categories.find { it.id == defaultCategoryId.toLong() }

2
app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourcePresenter.kt
View File

@ -258,7 +258,7 @@ open class BrowseSourcePresenter(
if (!hasNextPage()) return if (!hasNextPage()) return
nextPageJob?.cancel() nextPageJob?.cancel()
nextPageJob = launchIO { nextPageJob = presenterScope.launchIO {
try { try {
pager.requestNextPage() pager.requestNextPage()
} catch (e: Throwable) { } catch (e: Throwable) {

2
app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaPresenter.kt
View File

@ -1440,7 +1440,7 @@ class MangaPresenter(
fun trackingSearch(query: String, service: TrackService) { fun trackingSearch(query: String, service: TrackService) {
searchTrackerJob?.cancel() searchTrackerJob?.cancel()
searchTrackerJob = launchIO { searchTrackerJob = presenterScope.launchIO {
try { try {
val results = service.search(query) val results = service.search(query)
withUIContext { view?.onTrackingSearchResults(results) } withUIContext { view?.onTrackingSearchResults(results) }

2
app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt
View File

@ -293,7 +293,7 @@ class ReaderPresenter(
fun init(mangaId: Long, initialChapterId: Long) { fun init(mangaId: Long, initialChapterId: Long) {
if (!needsInit()) return if (!needsInit()) return
launchIO { presenterScope.launchIO {
try { try {
// SY --> // SY -->
val manga = getManga.await(mangaId) ?: return@launchIO val manga = getManga.await(mangaId) ?: return@launchIO

2
app/src/main/java/eu/kanade/tachiyomi/ui/setting/track/TrackLoginDialog.kt
View File

@ -21,8 +21,6 @@ class TrackLoginDialog(
private val service = Injekt.get<TrackManager>().getService(args.getLong("serviceId"))!! private val service = Injekt.get<TrackManager>().getService(args.getLong("serviceId"))!!
constructor(service: TrackService) : this(service, null)
constructor(service: TrackService, @StringRes usernameLabelRes: Int?) : constructor(service: TrackService, @StringRes usernameLabelRes: Int?) :
this(usernameLabelRes, bundleOf("serviceId" to service.id)) this(usernameLabelRes, bundleOf("serviceId" to service.id))