π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
[mob][photos] Fix failure to upload a photo to multiple albums (#11055)
Alex Emami7edc8daab4a0
diff --git a/mobile/apps/photos/changes/multi-album-upload.md b/mobile/apps/photos/changes/multi-album-upload.mdnew file mode 100644index 0000000000..2725ce8dda--- /dev/null+++ b/mobile/apps/photos/changes/multi-album-upload.md@@ -0,0 +1 @@+- Fixed uploading photos to multiple albums at once. Thanks @nuit-dhiver!diff --git a/mobile/apps/photos/lib/db/files_db.dart b/mobile/apps/photos/lib/db/files_db.dartindex 3e860c2b70..0990ac9a67 100644--- a/mobile/apps/photos/lib/db/files_db.dart+++ b/mobile/apps/photos/lib/db/files_db.dart@@ -1011,7 +1011,7 @@ class FilesDB with SqlDbBase {'SELECT * FROM $filesTable WHERE ($columnUploadedFileID IS NULL OR ''$columnUploadedFileID IS -1) AND $columnCollectionID IS NOT NULL AND ''$columnCollectionID IS NOT -1 AND $columnLocalID IS NOT NULL AND '- '$columnLocalID IS NOT -1 GROUP BY $columnLocalID '+ '$columnLocalID IS NOT -1 ''ORDER BY $columnCreationTime DESC',);final files = convertToFiles(results);diff --git a/mobile/apps/photos/lib/module/upload/service/file_uploader.dart b/mobile/apps/photos/lib/module/upload/service/file_uploader.dartindex 6ef8b81962..2b4299a3c1 100644--- a/mobile/apps/photos/lib/module/upload/service/file_uploader.dart+++ b/mobile/apps/photos/lib/module/upload/service/file_uploader.dart@@ -188,18 +188,17 @@ class FileUploader {);// Else wait for the existing upload to complete,// and add it to the relevant collection- return request.item.completer.future.then((uploadedFile) {- // If the fileUploader completer returned null,+ return request.item.completer.future.then((uploadedFile) async {_logger.info("original upload completer resolved, try adding the file to another ""collection",);- return CollectionsService.instance- .addOrCopyToCollection(collectionID, [uploadedFile])- .then((aVoid) {- return uploadedFile;- });+ final fileInCollection = uploadedFile.copyWith();+ await CollectionsService.instance.addOrCopyToCollection(collectionID, [+ fileInCollection,+ ]);+ return fileInCollection;});}diff --git a/mobile/apps/photos/lib/ui/actions/collection/collection_file_actions.dart b/mobile/apps/photos/lib/ui/actions/collection/collection_file_actions.dartindex 73eaad6d7f..0f07118519 100644--- a/mobile/apps/photos/lib/ui/actions/collection/collection_file_actions.dart+++ b/mobile/apps/photos/lib/ui/actions/collection/collection_file_actions.dart@@ -123,6 +123,10 @@ extension CollectionFileActions on CollectionActions {}if (currentFile.uploadedFileID == null) {+ if (currentFile.collectionID != null &&+ currentFile.collectionID != collection.id) {+ currentFile.generatedID = null;+ }currentFile.collectionID = collection.id;filesPendingUpload.add(currentFile);} else {