Mirrors/tachiyomi
2
0
Fork 0
mirror of https://github.com/tachiyomiorg/tachiyomi.git synced 2024-11-19 23:49:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Make active page nullable. Fixes #326

Browse Source
This commit is contained in:
len 2016-06-03 12:25:39 +02:00
parent 0714fdc7e6
commit 728ab18017
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -117,7 +117,10 @@ class ReaderActivity : BaseRxActivity<ReaderPresenter>() {
override fun onPause() { override fun onPause() {
viewer?.let { viewer?.let {
presenter.currentPage = it.getActivePage() val activePage = it.getActivePage()
if (activePage != null) {
presenter.currentPage = activePage
}
} }
super.onPause() super.onPause()
} }
@ -318,9 +321,13 @@ class ReaderActivity : BaseRxActivity<ReaderPresenter>() {
fun gotoPageInCurrentChapter(pageIndex: Int) { fun gotoPageInCurrentChapter(pageIndex: Int) {
viewer?.let { viewer?.let {
val requestedPage = it.getActivePage().chapter.pages[pageIndex] val activePage = it.getActivePage()
if (activePage != null) {
val requestedPage = activePage.chapter.pages[pageIndex]
it.setActivePage(requestedPage) it.setActivePage(requestedPage)
} }
}
} }
fun toggleMenu() { fun toggleMenu() {

6
app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/base/BaseReader.kt
View File

@ -71,14 +71,16 @@ abstract class BaseReader : BaseFragment() {
*/ */
fun updatePageNumber() { fun updatePageNumber() {
val activePage = getActivePage() val activePage = getActivePage()
if (activePage != null) {
readerActivity.onPageChanged(activePage.pageNumber, activePage.chapter.pages.size) readerActivity.onPageChanged(activePage.pageNumber, activePage.chapter.pages.size)
} }
}
/** /**
* Returns the active page. * Returns the active page.
*/ */
fun getActivePage(): Page { fun getActivePage(): Page? {
return pages.getOrElse(currentPage) { pages[0] } return pages.getOrNull(currentPage)
} }
/** /**