Fix duplicate AutoUpload WiFi (#4137)

* cod

Signed-off-by: Marino Faggiana <marino.faggiana@nextcloud.com>

* cod

Signed-off-by: Marino Faggiana <marino.faggiana@nextcloud.com>

* build 1

Signed-off-by: Marino Faggiana <marino.faggiana@nextcloud.com>

---------

Signed-off-by: Marino Faggiana <marino.faggiana@nextcloud.com>

Author: marinofaggiana

Nextcloud.xcodeproj/project.pbxproj

@@ -6035,7 +6035,7 @@
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 0;
+				CURRENT_PROJECT_VERSION = 1;
 				DEAD_CODE_STRIPPING = YES;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = NKUJUXUJ3B;
@@ -6103,7 +6103,7 @@
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 0;
+				CURRENT_PROJECT_VERSION = 1;
 				DEAD_CODE_STRIPPING = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = NKUJUXUJ3B;
@@ -6388,8 +6388,8 @@
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/nextcloud/NextcloudKit";
 			requirement = {
-				kind = exactVersion;
-				version = 7.3.3;
+				branch = main;
+				kind = branch;
 			};
 		};
 		F788ECC5263AAAF900ADC67F /* XCRemoteSwiftPackageReference "MarkdownKit" */ = {

iOSClient/Data/NCManageDatabase+Metadata.swift

@@ -1387,6 +1387,28 @@ extension NCManageDatabase {
         } ?? 0
     }
 
+    /// Filters Auto Upload metadata entries, returning only the items that are not already queued in the local database.
+    /// - Parameter metadatas: The detached Auto Upload metadata entries generated from Photos assets.
+    /// - Returns: Only metadata entries that can be safely added to the upload queue.
+    func filterAutoUploadMetadatasNotAlreadyQueuedAsync(_ metadatas: [tableMetadata]) async -> [tableMetadata] {
+        await core.performRealmReadAsync { realm in
+            metadatas.filter { metadata in
+                guard !metadata.assetLocalIdentifier.isEmpty else {
+                    return false
+                }
+                return realm.objects(tableMetadata.self)
+                    .filter(
+                        "account == %@ AND sessionSelector == %@ AND assetLocalIdentifier == %@ AND session != %@",
+                        metadata.account,
+                        NCGlobal.shared.selectorUploadAutoUpload,
+                        metadata.assetLocalIdentifier,
+                        ""
+                    )
+                    .isEmpty
+            }
+        } ?? []
+    }
+
     // MARK: - helpers
 
     /// Extracts the relative DAV folder path and filename from metadata.

iOSClient/Networking/NCAutoUpload.swift

@@ -29,7 +29,7 @@ class NCAutoUpload: NSObject {
             let assetCollections = PHAssetCollection.allAlbums.filter({albumIds.contains($0.localIdentifier)})
             let result = await getCameraRollAssets(controller: nil, assetCollections: assetCollections, tblAccount: tableAccount(value: tblAccount))
             if let assets = result.assets, !assets.isEmpty, let fileNames = result.fileNames {
-                let item = await uploadAssets(controller: nil, tblAccount: tblAccount, assets: assets, fileNames: fileNames)
+                let item = await uploadAssets(controller: nil, tblAccount: tblAccount, assets: assets, fileNames: fileNames, filterExistingQueue: true)
                 counter += item
             }
         }
@@ -78,14 +78,15 @@ class NCAutoUpload: NSObject {
             return
         }
 
-        let num = await uploadAssets(controller: controller, tblAccount: tblAccount, assets: assets, fileNames: fileNames)
+        let num = await uploadAssets(controller: controller, tblAccount: tblAccount, assets: assets, fileNames: fileNames, filterExistingQueue: false)
         nkLog(debug: "Automatic upload \(num) upload")
     }
 
     private func uploadAssets(controller: NCMainTabBarController?,
                               tblAccount: tableAccount,
                               assets: [PHAsset],
-                              fileNames: [String]) async -> Int {
+                              fileNames: [String],
+                              filterExistingQueue: Bool) async -> Int {
         let capabilities = await NKCapabilities.shared.getCapabilities(for: tblAccount.account)
         let autoMkcol = NCBrandOptions.shared.isServerVersion(capabilities, greaterOrEqualTo: .v33)
         let session = NCSession.shared.getSession(account: tblAccount.account)
@@ -167,6 +168,16 @@ class NCAutoUpload: NSObject {
         }
 
         if !metadatas.isEmpty {
+            let metadatasToAdd: [tableMetadata]
+            if filterExistingQueue {
+                metadatasToAdd = await self.database.filterAutoUploadMetadatasNotAlreadyQueuedAsync(metadatas)
+            } else {
+                metadatasToAdd = metadatas
+            }
+            guard !metadatasToAdd.isEmpty else {
+                return 0
+            }
+
             if autoMkcol {
                 await self.database.addMetadatasAsync(metadatas)
             } else {