Destroy action mode after actioning in chapters list (closes #3004)

(cherry picked from commit 03baa21185f94541c8d1009163afb5ec83068621)
This commit is contained in:
arkon 2020-05-06 23:21:17 -04:00 committed by Jobobby04
parent 02e3148efe
commit 1d760f4728

View File

@ -499,10 +499,12 @@ class ChaptersController :
if (presenter.preferences.removeAfterMarkedAsRead()) { if (presenter.preferences.removeAfterMarkedAsRead()) {
deleteChapters(chapters) deleteChapters(chapters)
} }
destroyActionModeIfNeeded()
} }
private fun markAsUnread(chapters: List<ChapterItem>) { private fun markAsUnread(chapters: List<ChapterItem>) {
presenter.markChaptersRead(chapters, false) presenter.markChaptersRead(chapters, false)
destroyActionModeIfNeeded()
} }
private fun downloadChapters(chapters: List<ChapterItem>) { private fun downloadChapters(chapters: List<ChapterItem>) {
@ -515,6 +517,7 @@ class ChaptersController :
} }
} }
} }
destroyActionModeIfNeeded()
} }
private fun showDeleteChaptersConfirmationDialog() { private fun showDeleteChaptersConfirmationDialog() {
@ -532,16 +535,19 @@ class ChaptersController :
if (chapterPos != -1) { if (chapterPos != -1) {
markAsRead(prevChapters.take(chapterPos)) markAsRead(prevChapters.take(chapterPos))
} }
destroyActionModeIfNeeded()
} }
private fun bookmarkChapters(chapters: List<ChapterItem>, bookmarked: Boolean) { private fun bookmarkChapters(chapters: List<ChapterItem>, bookmarked: Boolean) {
presenter.bookmarkChapters(chapters, bookmarked) presenter.bookmarkChapters(chapters, bookmarked)
destroyActionModeIfNeeded()
} }
fun deleteChapters(chapters: List<ChapterItem>) { fun deleteChapters(chapters: List<ChapterItem>) {
if (chapters.isEmpty()) return if (chapters.isEmpty()) return
presenter.deleteChapters(chapters) presenter.deleteChapters(chapters)
destroyActionModeIfNeeded()
} }
fun onChaptersDeleted(chapters: List<ChapterItem>) { fun onChaptersDeleted(chapters: List<ChapterItem>) {
@ -584,6 +590,7 @@ class ChaptersController :
if (chaptersToDownload.isNotEmpty()) { if (chaptersToDownload.isNotEmpty()) {
downloadChapters(chaptersToDownload) downloadChapters(chaptersToDownload)
} }
destroyActionModeIfNeeded()
} }
private fun showCustomDownloadDialog() { private fun showCustomDownloadDialog() {