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

Avoid crashes when fetching assist content URL in ReaderActivity

Browse Source 
(cherry picked from commit e265b929a19d3258cbe305d5b4a2d2bdcf1eb9ec)
This commit is contained in:
arkon 2023-01-08 15:23:06 -05:00 committed by Jobobby04
parent 9bae13c0e6
commit 1a09fde22c
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
app/src/main/java/eu/kanade/presentation/browse/components/GlobalSerachCard.kt → app/src/main/java/eu/kanade/presentation/browse/components/GlobalSearchCard.kt
View File

13
app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
View File

@ -163,6 +163,7 @@ class ReaderActivity : BaseActivity() {
lateinit var binding: ReaderActivityBinding
val viewModel by viewModels<ReaderViewModel>()
private var assistUrl: String? = null
val hasCutout by lazy { hasDisplayCutout() }
@ -390,9 +391,7 @@ class ReaderActivity : BaseActivity() {
override fun onProvideAssistContent(outContent: AssistContent) {
super.onProvideAssistContent(outContent)
viewModel.getChapterUrl()?.let { url ->
outContent.webUri = url.toUri()
}
assistUrl?.let { outContent.webUri = it.toUri() }
}
/**
@ -1279,6 +1278,12 @@ class ReaderActivity : BaseActivity() {
// Invalidate menu to show proper chapter bookmark state
invalidateOptionsMenu()
lifecycleScope.launchIO {
viewModel.getChapterUrl()?.let { url ->
assistUrl = url
}
}
}
/**
@ -1311,7 +1316,7 @@ class ReaderActivity : BaseActivity() {
* Moves the viewer to the given page [index]. It does nothing if the viewer is null or the
* page is not found.
*/
fun moveToPageIndex(index: Int) {
private fun moveToPageIndex(index: Int) {
val viewer = viewer ?: return
val currentChapter = viewModel.getCurrentChapter() ?: return
val page = currentChapter.pages?.getOrNull(index) ?: return