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

Fix adding a manga to library crash

Browse Source
This commit is contained in:
Jobobby04 2020-05-03 23:05:42 -04:00
parent d368064549
commit 1170334fde
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryCategoryView.kt
View File

@ -26,6 +26,7 @@ import kotlinx.android.synthetic.main.library_category.view.fast_scroller
import kotlinx.android.synthetic.main.library_category.view.swipe_refresh
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.Job
import kotlinx.coroutines.SupervisorJob
import kotlinx.coroutines.cancel
import kotlinx.coroutines.flow.launchIn
@ -48,6 +49,8 @@ class LibraryCategoryView @JvmOverloads constructor(context: Context, attrs: Att
FlexibleAdapter.OnItemMoveListener,
CategoryAdapter.OnItemReleaseListener {
private val scope = CoroutineScope(Job() + Dispatchers.Main)
private val preferences: PreferencesHelper by injectLazy()
/**
@ -80,7 +83,7 @@ class LibraryCategoryView @JvmOverloads constructor(context: Context, attrs: Att
// EXH -->
private var initialLoadHandle: LoadingHandle? = null
lateinit var scope: CoroutineScope
lateinit var scope2: CoroutineScope
private fun newScope() = object : CoroutineScope {
override val coroutineContext = SupervisorJob() + Dispatchers.Main
@ -142,7 +145,7 @@ class LibraryCategoryView @JvmOverloads constructor(context: Context, attrs: Att
adapter.isLongPressDragEnabled = sortingMode == LibrarySort.DRAG_AND_DROP
// EXH -->
scope = newScope()
scope2 = newScope()
initialLoadHandle = controller.loaderManager.openProgressBar()
// EXH <--
@ -153,7 +156,7 @@ class LibraryCategoryView @JvmOverloads constructor(context: Context, attrs: Att
.observeOn(AndroidSchedulers.mainThread())
.subscribe {
// EXH -->
scope.launch {
scope2.launch {
val handle = controller.loaderManager.openProgressBar()
try {
// EXH <--
@ -169,7 +172,7 @@ class LibraryCategoryView @JvmOverloads constructor(context: Context, attrs: Att
subscriptions += controller.libraryMangaRelay
.subscribe {
// EXH -->
scope.launch {
scope2.launch {
try {
// EXH <--
onNextLibraryManga(this, it)
@ -237,7 +240,7 @@ class LibraryCategoryView @JvmOverloads constructor(context: Context, attrs: Att
fun unsubscribe() {
subscriptions.clear()
// EXH -->
scope.cancel()
scope2.cancel()
controller.loaderManager.closeProgressBar(initialLoadHandle)
// EXH <--
}