diff --git a/app/src/main/java/sushi/hardcore/droidfs/explorers/ExplorerActivity.kt b/app/src/main/java/sushi/hardcore/droidfs/explorers/ExplorerActivity.kt index 7c591ba..a62fc1c 100644 --- a/app/src/main/java/sushi/hardcore/droidfs/explorers/ExplorerActivity.kt +++ b/app/src/main/java/sushi/hardcore/droidfs/explorers/ExplorerActivity.kt @@ -131,10 +131,9 @@ class ExplorerActivity : BaseExplorerActivity() { ${getString(R.string.ask_for_wipe)} """.trimIndent()) .setPositiveButton(R.string.yes) { _, _ -> - fileOperationService.wipeUris(urisToWipe) { errorMsg -> + fileOperationService.wipeUris(urisToWipe, rootFile) { errorMsg -> runOnUiThread { if (errorMsg == null){ - rootFile?.delete() Toast.makeText(this, R.string.wipe_successful, Toast.LENGTH_SHORT).show() } else { ColoredAlertDialogBuilder(this) diff --git a/app/src/main/java/sushi/hardcore/droidfs/file_operations/FileOperationService.kt b/app/src/main/java/sushi/hardcore/droidfs/file_operations/FileOperationService.kt index 99406f4..09b3dee 100644 --- a/app/src/main/java/sushi/hardcore/droidfs/file_operations/FileOperationService.kt +++ b/app/src/main/java/sushi/hardcore/droidfs/file_operations/FileOperationService.kt @@ -307,7 +307,7 @@ class FileOperationService : Service() { }.start() } - fun wipeUris(uris: List, callback: (String?) -> Unit){ + fun wipeUris(uris: List, rootFile: DocumentFile? = null, callback: (String?) -> Unit){ Thread { val notification = showNotification(R.string.file_op_wiping_msg, uris.size) var errorMsg: String? = null @@ -323,6 +323,9 @@ class FileOperationService : Service() { break } } + if (errorMsg == null) { + rootFile?.delete() + } cancelNotification(notification) callback(errorMsg) }.start()