浏览代码

Fixed bug on dismissing the delete from trash dialog on loading/succes state

ashilkn 2 年之前
父节点
当前提交
bb01b369e2
共有 1 个文件被更改,包括 3 次插入1 次删除
  1. 3 1
      lib/utils/delete_file_util.dart

+ 3 - 1
lib/utils/delete_file_util.dart

@@ -262,6 +262,7 @@ Future<void> deleteFilesOnDeviceOnly(
 }
 }
 
 
 Future<bool> deleteFromTrash(BuildContext context, List<File> files) async {
 Future<bool> deleteFromTrash(BuildContext context, List<File> files) async {
+  bool didDeletionStart = false;
   final result = await showNewChoiceDialog(
   final result = await showNewChoiceDialog(
     context,
     context,
     title: "Delete permanently",
     title: "Delete permanently",
@@ -270,6 +271,7 @@ Future<bool> deleteFromTrash(BuildContext context, List<File> files) async {
     isCritical: true,
     isCritical: true,
     firstButtonOnTap: () async {
     firstButtonOnTap: () async {
       try {
       try {
+        didDeletionStart = true;
         await TrashSyncService.instance.deleteFromTrash(files);
         await TrashSyncService.instance.deleteFromTrash(files);
         Bus.instance.fire(
         Bus.instance.fire(
           FilesUpdatedEvent(
           FilesUpdatedEvent(
@@ -289,7 +291,7 @@ Future<bool> deleteFromTrash(BuildContext context, List<File> files) async {
     return false;
     return false;
   }
   }
   if (result == null || result == ButtonAction.cancel) {
   if (result == null || result == ButtonAction.cancel) {
-    return false;
+    return didDeletionStart ? true : false;
   } else {
   } else {
     return true;
     return true;
   }
   }