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

Fix app crash in some rare cases in reader

Browse Source
This commit is contained in:
NerdNumber9 2019-04-13 23:56:40 -04:00
parent d4f1014df6
commit 1bae7ba8f5
2 changed files with 48 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerViewer.kt
View File

@ -6,6 +6,7 @@ import android.view.KeyEvent
import android.view.MotionEvent import android.view.MotionEvent
import android.view.View import android.view.View
import android.view.ViewGroup.LayoutParams import android.view.ViewGroup.LayoutParams
import com.elvishew.xlog.XLog
import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.R
import eu.kanade.tachiyomi.ui.reader.ReaderActivity import eu.kanade.tachiyomi.ui.reader.ReaderActivity
import eu.kanade.tachiyomi.ui.reader.model.ChapterTransition import eu.kanade.tachiyomi.ui.reader.model.ChapterTransition
@ -139,7 +140,29 @@ abstract class PagerViewer(val activity: ReaderActivity) : BaseViewer {
* activity of the change and requests the preload of the next chapter if this is the last page. * activity of the change and requests the preload of the next chapter if this is the last page.
*/ */
private fun onPageSelected(page: ReaderPage, position: Int) { private fun onPageSelected(page: ReaderPage, position: Int) {
val pages = page.chapter.pages!! // Won't be null because it's the loaded chapter val pages = page.chapter.pages // Won't be null because it's the loaded chapter
// EXH -->
if(pages == null) {
XLog.e("Pager reader chapter pages are null (position: %s," +
" page.index: %s," +
" page.url: %s," +
" page.imageUrl: %s," +
" page.chapter.state: %s," +
" page.chapter.pageLoader == null: %s," +
" page.chapter.requestedPage: %s" +
" page.chapter.references: %s)!",
position,
page.index,
page.url,
page.imageUrl,
page.chapter.state::class.simpleName,
page.chapter.pageLoader == null,
page.chapter.requestedPage,
page.chapter.references)
return
}
// EXH <--
Timber.d("onPageSelected: ${page.number}/${pages.size}") Timber.d("onPageSelected: ${page.number}/${pages.size}")
activity.onPageSelected(page) activity.onPageSelected(page)

25
app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonViewer.kt
View File

@ -7,6 +7,7 @@ import android.view.MotionEvent
import android.view.View import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
import android.view.ViewGroup.LayoutParams.MATCH_PARENT import android.view.ViewGroup.LayoutParams.MATCH_PARENT
import com.elvishew.xlog.XLog
import eu.kanade.tachiyomi.ui.reader.ReaderActivity import eu.kanade.tachiyomi.ui.reader.ReaderActivity
import eu.kanade.tachiyomi.ui.reader.model.ChapterTransition import eu.kanade.tachiyomi.ui.reader.model.ChapterTransition
import eu.kanade.tachiyomi.ui.reader.model.ReaderPage import eu.kanade.tachiyomi.ui.reader.model.ReaderPage
@ -135,7 +136,29 @@ class WebtoonViewer(val activity: ReaderActivity) : BaseViewer {
* activity of the change and requests the preload of the next chapter if this is the last page. * activity of the change and requests the preload of the next chapter if this is the last page.
*/ */
private fun onPageSelected(page: ReaderPage, position: Int) { private fun onPageSelected(page: ReaderPage, position: Int) {
val pages = page.chapter.pages!! // Won't be null because it's the loaded chapter val pages = page.chapter.pages // Won't be null because it's the loaded chapter
// EXH -->
if(pages == null) {
XLog.e("Webtoon reader chapter pages are null (position: %s," +
" page.index: %s," +
" page.url: %s," +
" page.imageUrl: %s," +
" page.chapter.state: %s," +
" page.chapter.pageLoader == null: %s," +
" page.chapter.requestedPage: %s" +
" page.chapter.references: %s)!",
position,
page.index,
page.url,
page.imageUrl,
page.chapter.state::class.simpleName,
page.chapter.pageLoader == null,
page.chapter.requestedPage,
page.chapter.references)
return
}
// EXH <--
Timber.d("onPageSelected: ${page.number}/${pages.size}") Timber.d("onPageSelected: ${page.number}/${pages.size}")
activity.onPageSelected(page) activity.onPageSelected(page)