From 537b2be914a84f54e26bf806191b0ef401deeb85 Mon Sep 17 00:00:00 2001 From: Yash Khare Date: Wed, 15 Apr 2020 21:21:18 +0530 Subject: [PATCH] Use an extension function to delete zims --- .../fileselect_view/effects/DeleteFiles.kt | 22 ++++++++++++------- 1 file changed, 14 insertions(+), 8 deletions(-) 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 {