github/mihon
1
0
Fork 0
mirror of https://github.com/mihonapp/mihon.git synced 2024-11-30 05:55:04 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

chapter deletion logic fixed (#3320)

Browse source
This commit is contained in:
Dimitri Rogava 2020-06-16 07:03:56 +04:00 committed by GitHub
parent c041410f61
commit f642f23366
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt
View file

@ -361,7 +361,7 @@ class ReaderPresenter(
if (selectedChapter.pages?.lastIndex == page.index) { if (selectedChapter.pages?.lastIndex == page.index) {
selectedChapter.chapter.read = true selectedChapter.chapter.read = true
updateTrackChapterRead(selectedChapter) updateTrackChapterRead(selectedChapter)
enqueueDeleteReadChapters(selectedChapter) deleteChapterIfNeeded(selectedChapter)
} }
if (selectedChapter != currentChapters.currChapter) { if (selectedChapter != currentChapters.currChapter) {
@ -371,6 +371,22 @@ class ReaderPresenter(
} }
} }
/**
* Determines if deleting option is enabled and nth to last chapter actually exists.
* If both conditions are satisfied enqueues chapter for delete
* @param currentChapter current chapter, which is going to be marked as read.
*/
private fun deleteChapterIfNeeded(currentChapter: ReaderChapter) {
// Determine which chapter should be deleted and enqueue
val currentChapterPosition = chapterList.indexOf(currentChapter)
val removeAfterReadSlots = preferences.removeAfterReadSlots()
val chapterToDelete = chapterList.getOrNull(currentChapterPosition - removeAfterReadSlots)
// Check if deleting option is enabled and chapter exists
if (removeAfterReadSlots != -1 && chapterToDelete != null) {
enqueueDeleteReadChapters(chapterToDelete)
}
}
/** /**
* Called when a chapter changed from [fromChapter] to [toChapter]. It updates [fromChapter] * Called when a chapter changed from [fromChapter] to [toChapter]. It updates [fromChapter]
* on the database. * on the database.
@ -653,19 +669,8 @@ class ReaderPresenter(
if (!chapter.chapter.read || chapter.pageLoader !is DownloadPageLoader) return if (!chapter.chapter.read || chapter.pageLoader !is DownloadPageLoader) return
val manga = manga ?: return val manga = manga ?: return
// Return if the setting is disabled
val removeAfterReadSlots = preferences.removeAfterReadSlots()
if (removeAfterReadSlots == -1) return
launchIO { launchIO {
// Position of the read chapter downloadManager.enqueueDeleteChapters(listOf(chapter.chapter), manga)
val position = chapterList.indexOf(chapter)
// Retrieve chapter to delete according to preference
val chapterToDelete = chapterList.getOrNull(position - removeAfterReadSlots)
if (chapterToDelete != null) {
downloadManager.enqueueDeleteChapters(listOf(chapterToDelete.chapter), manga)
}
} }
} }