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

Added page.ready check

Browse Source
This commit is contained in:
Bram van de Kerkhof 2016-11-13 14:07:20 +01:00
parent 7d3d0999f3
commit 13954ffe01
2 changed files with 33 additions and 22 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

@ -225,10 +225,6 @@ class ReaderActivity : BaseRxActivity<ReaderPresenter>() {
toast(error.message) toast(error.message)
} }
fun onChapterAppendError() {
// Ignore
}
fun onLongPress(page: Page) { fun onLongPress(page: Page) {
MaterialDialog.Builder(this) MaterialDialog.Builder(this)
.title(getString(R.string.options)) .title(getString(R.string.options))
@ -243,6 +239,10 @@ class ReaderActivity : BaseRxActivity<ReaderPresenter>() {
}.show() }.show()
} }
fun onChapterAppendError() {
// Ignore
}
/** /**
* Called from the presenter at startup, allowing to prepare the selected reader. * Called from the presenter at startup, allowing to prepare the selected reader.
*/ */
@ -476,6 +476,9 @@ class ReaderActivity : BaseRxActivity<ReaderPresenter>() {
* @param page page object containing image information. * @param page page object containing image information.
*/ */
fun shareImage(page: Page) { fun shareImage(page: Page) {
if (page.status != Page.READY)
return
val shareIntent = Intent().apply { val shareIntent = Intent().apply {
action = Intent.ACTION_SEND action = Intent.ACTION_SEND
putExtra(Intent.EXTRA_STREAM, Uri.parse(page.imagePath)) putExtra(Intent.EXTRA_STREAM, Uri.parse(page.imagePath))

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

@ -384,7 +384,9 @@ class ReaderPresenter : BasePresenter<ReaderActivity>() {
val removeAfterReadSlots = prefs.removeAfterReadSlots() val removeAfterReadSlots = prefs.removeAfterReadSlots()
when (removeAfterReadSlots) { when (removeAfterReadSlots) {
// Setting disabled // Setting disabled
-1 -> { /**Empty function**/ } -1 -> {
/**Empty function**/
}
// Remove current read chapter // Remove current read chapter
0 -> deleteChapter(chapter, manga) 0 -> deleteChapter(chapter, manga)
// Remove previous chapter specified by user in settings. // Remove previous chapter specified by user in settings.
@ -531,6 +533,9 @@ class ReaderPresenter : BasePresenter<ReaderActivity>() {
* Update cover with page file. * Update cover with page file.
*/ */
internal fun setCover(page: Page) { internal fun setCover(page: Page) {
if (page.status != Page.READY)
return
try { try {
if (manga.favorite) { if (manga.favorite) {
if (manga.thumbnail_url != null) { if (manga.thumbnail_url != null) {
@ -554,6 +559,9 @@ class ReaderPresenter : BasePresenter<ReaderActivity>() {
*/ */
@Throws(IOException::class) @Throws(IOException::class)
internal fun savePage(page: Page) { internal fun savePage(page: Page) {
if (page.status != Page.READY)
return
// Used to show image notification // Used to show image notification
val imageNotifier = ImageNotifier(context) val imageNotifier = ImageNotifier(context)