π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
[mobile] Avoid mutating files before collection requests complete
Neeraj Guptae53a102e8100
diff --git a/mobile/apps/photos/lib/services/collections_service.dart b/mobile/apps/photos/lib/services/collections_service.dartindex 12832e953d..10a3422160 100644--- a/mobile/apps/photos/lib/services/collections_service.dart+++ b/mobile/apps/photos/lib/services/collections_service.dart@@ -2454,12 +2454,13 @@ class CollectionsService {required int fromCollectionID,}) async {_validateMoveRequest(toCollectionID, fromCollectionID, files);- files.removeWhere((element) => element.uploadedFileID == null);- if (files.isEmpty) {+ final filesToMove = files.map((file) => file.copyWith()).toList();+ filesToMove.removeWhere((element) => element.uploadedFileID == null);+ if (filesToMove.isEmpty) {_logger.info("nothing to move to collection");return;}- final batchedFiles = files.chunks(batchSize);+ final batchedFiles = filesToMove.chunks(batchSize);for (final batch in batchedFiles) {final fileItems = <CollectionFileItem>[];for (final file in batch) {@@ -2494,12 +2495,12 @@ class CollectionsService {await _filesDB.removeFromCollection(fromCollectionID,- files.map((e) => e.uploadedFileID!).toList(),+ filesToMove.map((e) => e.uploadedFileID!).toList(),);Bus.instance.fire(CollectionUpdatedEvent(fromCollectionID,- files,+ filesToMove,"moveFrom",type: EventType.deletedFromRemote,),@@ -2507,11 +2508,13 @@ class CollectionsService {final existingUploadedIDs = await FilesDB.instance.getUploadedFileIDs(toCollectionID,);- files.removeWhere(+ filesToMove.removeWhere((element) => existingUploadedIDs.contains(element.uploadedFileID),);- await _filesDB.insertMultiple(files);- Bus.instance.fire(CollectionUpdatedEvent(toCollectionID, files, "moveTo"));+ await _filesDB.insertMultiple(filesToMove);+ Bus.instance.fire(+ CollectionUpdatedEvent(toCollectionID, filesToMove, "moveTo"),+ );}void _validateMoveRequest(