0ct0pu5/ente
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[mob][photos] Fix ownerID for copied items

Browse source
This commit is contained in:
Neeraj Gupta 2024-04-20 11:30:40 +05:30
parent 9a34fdce05
commit e2aae744be
1 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
mobile/lib/services/collections_service.dart
View file

@ -1177,9 +1177,9 @@ class CollectionsService {
final Map<int, List<EnteFile>> filesByCollection = {};
for (final file in filesToCopy) {
if (filesByCollection.containsKey(file.collectionID!)) {
filesByCollection[file.collectionID!]!.add(file);
filesByCollection[file.collectionID!]!.add(file.copyWith());
} else {
filesByCollection[file.collectionID!] = [file];
filesByCollection[file.collectionID!] = [file.copyWith()];
}
}
for (final entry in filesByCollection.entries) {
@ -1325,19 +1325,22 @@ class CollectionsService {
params["srcCollectionID"] = srcCollectionID;
for (final batch in batchedFiles) {
params["files"] = [];
for (final file in batch) {
final fileKey = getFileKey(file);
for (final batchFile in batch) {
final fileKey = getFileKey(batchFile);
_logger.info(
"srcCollection : $srcCollectionID file: ${batchFile.uploadedFileID} key: ${CryptoUtil.bin2base64(fileKey)} ",
);
final encryptedKeyData =
CryptoUtil.encryptSync(fileKey, getCollectionKey(dstCollectionID));
file.encryptedKey =
batchFile.encryptedKey =
CryptoUtil.bin2base64(encryptedKeyData.encryptedData!);
file.keyDecryptionNonce =
batchFile.keyDecryptionNonce =
CryptoUtil.bin2base64(encryptedKeyData.nonce!);
params["files"].add(
CollectionFileItem(
file.uploadedFileID!,
file.encryptedKey!,
file.keyDecryptionNonce!,
batchFile.uploadedFileID!,
batchFile.encryptedKey!,
batchFile.keyDecryptionNonce!,
).toMap(),
);
}
@ -1358,6 +1361,7 @@ class CollectionsService {
file.generatedID = null;
file.collectionID = dstCollectionID;
file.uploadedFileID = oldToCopiedFileIDMap[uploadIDForOriginalFIle];
file.ownerID = _config.getUserID();
oldToCopiedFileIDMap.remove(uploadIDForOriginalFIle);
} else {
throw Exception("Failed to copy file ${file.uploadedFileID}");