diff --git a/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/fileselect_view/effects/DeleteFiles.kt b/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/fileselect_view/effects/DeleteFiles.kt index 2611a7144..915a0c3f7 100644 --- a/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/fileselect_view/effects/DeleteFiles.kt +++ b/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/fileselect_view/effects/DeleteFiles.kt @@ -44,16 +44,22 @@ data class DeleteFiles(private val booksOnDiskListItems: List) : val name = booksOnDiskListItems.joinToString(separator = "\n") { it.book.title } dialogShower.show(DeleteZims(name), { - val booksDeleted = booksOnDiskListItems.fold(true) { acc, book -> - acc && deleteSpecificZimFile(book).also { - if (it && book.file.canonicalPath == zimReaderContainer.zimCanonicalPath) { - zimReaderContainer.setZimFile(null) - } + activity.toast( + if (booksOnDiskListItems.deleteAll()) + R.string.delete_zims_toast else + R.string.delete_zim_failed + ) + }) + } + + private fun List.deleteAll(): Boolean { + return this.fold(true) { acc, book -> + acc && deleteSpecificZimFile(book).also { + if (it && book.file.canonicalPath == zimReaderContainer.zimCanonicalPath) { + zimReaderContainer.setZimFile(null) } } - - activity.toast(if (booksDeleted) R.string.delete_zims_toast else R.string.delete_zim_failed) - }) + } } private fun deleteSpecificZimFile(book: BookOnDisk): Boolean {