π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
[mobile][photos] treat failures of _restoreFilesFromDeviceTrash as warnings and re-use logger class of relevant class
Priyanshu Dangare2a182e777e42
diff --git a/mobile/apps/photos/lib/ui/viewer/actions/file_selection_actions_widget.dart b/mobile/apps/photos/lib/ui/viewer/actions/file_selection_actions_widget.dartindex 20e67e4dd4..4acd0e1b88 100644--- a/mobile/apps/photos/lib/ui/viewer/actions/file_selection_actions_widget.dart+++ b/mobile/apps/photos/lib/ui/viewer/actions/file_selection_actions_widget.dart@@ -1305,28 +1305,30 @@ class _FileSelectionActionsWidgetStatewidget.selectedFiles.replaceSelection(skippedFiles.toSet());}}-}-Future<void> _restoreFilesFromDeviceTrash(SelectedFiles selectedFiles) async {- final files = selectedFiles.files- .map((f) => f.asDeviceTrashFile!.toAssetEntity())- .toList();- final restoredIDs = <String>{};- try {- for (final batch in files.chunks(batchSize)) {- final result = await PhotoManager.editor.android.restoreFromTrash(batch);- restoredIDs.addAll(result);- }- } catch (e, s) {- Logger("_restoreFilesFromDeviceTrash").severe(e, s);- rethrow;- } finally {- if (restoredIDs.isNotEmpty) {- final restoredFiles = selectedFiles.files.where(- (f) => restoredIDs.contains(f.localID),- );- selectedFiles.unSelectAll(restoredFiles.toSet());- Bus.instance.fire(ForceReloadTrashPageEvent());+ Future<void> _restoreFilesFromDeviceTrash(SelectedFiles selectedFiles) async {+ final files = selectedFiles.files+ .map((f) => f.asDeviceTrashFile!.toAssetEntity())+ .toList();+ final restoredIDs = <String>{};+ try {+ for (final batch in files.chunks(batchSize)) {+ final result = await PhotoManager.editor.android.restoreFromTrash(+ batch,+ );+ restoredIDs.addAll(result);+ }+ } catch (e, s) {+ _logger.warning("_restoreFilesFromDeviceTrash failed:", e, s);+ rethrow;+ } finally {+ if (restoredIDs.isNotEmpty) {+ final restoredFiles = selectedFiles.files.where(+ (f) => restoredIDs.contains(f.localID),+ );+ selectedFiles.unSelectAll(restoredFiles.toSet());+ Bus.instance.fire(ForceReloadTrashPageEvent());+ }}}}