diff --git a/mobile/lib/utils/delete_file_util.dart b/mobile/lib/utils/delete_file_util.dart index 6e5c65a4da..7757e29dc7 100644 --- a/mobile/lib/utils/delete_file_util.dart +++ b/mobile/lib/utils/delete_file_util.dart @@ -328,6 +328,7 @@ Future deleteLocalFiles( BuildContext context, List localIDs, ) async { + _logger.info("Trying to delete local files "); final List deletedIDs = []; final List localAssetIDs = []; final List localSharedMediaIDs = []; @@ -391,16 +392,20 @@ Future deleteLocalFilesAfterRemovingAlreadyDeletedIDs( BuildContext context, List localIDs, ) async { - final files = - await FilesDB.instance.getLocalFiles(localIDs, dedupeByLocalID: true); + _logger.info( + "Trying to delete local files after removing already deleted IDs", + ); + final List deletedIDs = []; final List localAssetIDs = []; final List localSharedMediaIDs = []; final List alreadyDeletedIDs = []; // to ignore already deleted files + final dialog = createProgressDialog(context, "Loading..."); + await dialog.show(); try { - final dialog = createProgressDialog(context, "Loading..."); - await dialog.show(); + final files = + await FilesDB.instance.getLocalFiles(localIDs, dedupeByLocalID: true); for (final file in files) { if (!(await _localFileExist(file))) { _logger.warning("Already deleted " + file.toString()); @@ -458,6 +463,7 @@ Future deleteLocalFilesAfterRemovingAlreadyDeletedIDs( } } catch (e, s) { _logger.severe("Could not delete local files", e, s); + await dialog.hide(); return false; } } @@ -466,12 +472,14 @@ Future deleteLocalFilesAfterRemovingAlreadyDeletedIDs( Future retryFreeUpSpaceAfterRemovingNonExistingAssets( BuildContext context, ) async { - _logger.info("Retrying free up space after removing non-existing assets"); - try { - final dialog = - createProgressDialog(context, "Please wait, this will take a while..."); - await dialog.show(); + _logger.info( + "Retrying free up space after removing non-existing assets", + ); + final dialog = + createProgressDialog(context, "Please wait, this will take a while..."); + await dialog.show(); + try { final stopwatch = Stopwatch()..start(); final res = await PhotoManager.editor.android.removeAllNoExistsAsset(); if (res == false) { @@ -530,6 +538,7 @@ Future retryFreeUpSpaceAfterRemovingNonExistingAssets( return true; } } catch (e) { + await dialog.hide(); return false; } }