fix: preserve legacy auto upload progress for Live Photos

iOSClient/Data/NCManageDatabase+AutoUpload.swift

@@ -31,6 +31,26 @@ extension NCManageDatabase {
 
     // MARK: - Realm Write
 
+    /// Records a resource already present on the server without treating it as a new upload.
+    func completeExistingAutoUploadAsync(_ metadata: tableMetadata) async {
+        let detached = metadata.detachedCopy()
+        await core.performRealmWriteAsync { realm in
+            guard let transfer = realm.object(ofType: tableMetadata.self, forPrimaryKey: detached.ocId),
+                  transfer.sessionSelector == NCGlobal.shared.selectorUploadAutoUpload,
+                  let account = realm.objects(tableAccount.self).filter("account == %@", detached.account).first,
+                  account.autoUploadStart else { return }
+            if let serverUrlBase = transfer.autoUploadServerUrlBase {
+                let completed = tableAutoUploadTransfer(account: transfer.account,
+                                                        serverUrlBase: serverUrlBase,
+                                                        fileName: transfer.fileNameView,
+                                                        assetLocalIdentifier: transfer.assetLocalIdentifier,
+                                                        date: transfer.creationDate as Date)
+                realm.add(completed, update: .all)
+            }
+            realm.delete(transfer)
+        }
+    }
+
     func addAutoUploadTransferAsync(account: String,
                                     serverUrlBase: String,
                                     fileName: String,

iOSClient/Networking/NCAutoUpload.swift

@@ -115,10 +115,8 @@ class NCAutoUpload: NSObject {
         let formatCompatibility = NCPreferences().formatCompatibility
         let keychainLivePhoto = NCPreferences().livePhoto
         let fileSystem = NCUtilityFileSystem()
-        let knownFileNames = await self.database.fetchAutoUploadFileNamesAsync(account: tblAccount.account,
-                                                                        autoUploadServerUrlBase: autoUploadServerUrlBase)
+        let knownFileNames = await self.database.fetchAutoUploadFileNamesAsync(account: tblAccount.account, autoUploadServerUrlBase: autoUploadServerUrlBase)
 
-        let skipFileNames = knownFileNames.queued.union(knownFileNames.uploaded)
         var lastUploadedDate: Date?
         var canAdvanceSinceDate = true
 
@@ -149,7 +147,8 @@ class NCAutoUpload: NSObject {
 
             // A later success cannot move the restart date past an unfinished photo or Live Photo.
             canAdvanceSinceDate = false
-            if skipFileNames.contains(fileNameCompatible) || skipFileNames.contains(fileName) {
+            if knownFileNames.queued.contains(fileNameCompatible) || knownFileNames.queued.contains(fileName) ||
+                (isLivePhoto && knownFileNames.queued.contains(pairedFileName)) {
                 continue
             }
             let serverUrl = tblAccount.autoUploadCreateSubfolder
@@ -417,10 +416,10 @@ class NCAutoUpload: NSObject {
                 account: metadata.account
             )
 
-            if existsResult == .success {
-                await NCManageDatabase.shared.deleteMetadataAsync(id: metadata.ocId)
+            if existsResult == .success && !metadata.isLivePhoto {
+                await database.completeExistingAutoUploadAsync(metadata)
                 continue
-            } else if existsResult.errorCode != 404 {
+            } else if existsResult != .success && existsResult.errorCode != 404 {
                 continue
             }
 
@@ -435,6 +434,19 @@ class NCAutoUpload: NSObject {
             for extractedMetadata in extractedMetadatas {
                 guard !Task.isCancelled else { return }
 
+                if extractedMetadata.isLivePhoto {
+                    let resourceExists = await NCNetworking.shared.fileExists(
+                        serverUrlFileName: extractedMetadata.serverUrlFileName,
+                        account: extractedMetadata.account
+                    )
+                    if resourceExists == .success {
+                        await database.completeExistingAutoUploadAsync(extractedMetadata)
+                        continue
+                    } else if resourceExists.errorCode != 404 {
+                        continue
+                    }
+                }
+
                 let err = await NCNetworking.shared.uploadFileInBackground(
                     metadata: extractedMetadata.detachedCopy()
                 )

iOSClient/Networking/NCNetworkingProcess.swift

@@ -554,8 +554,8 @@ actor NCNetworkingProcess {
                 if metadata.sessionSelector == global.selectorUploadAutoUpload {
                     let existsResult = await networking.fileExists(serverUrlFileName: metadata.serverUrlFileName, account: metadata.account)
                     if existsResult == .success {
-                        // File exists → delete from local metadata and skip
-                        await NCManageDatabase.shared.deleteMetadataAsync(id: metadata.ocId)
+                        // Preserve completion in the incremental upload history before removing the transfer.
+                        await database.completeExistingAutoUploadAsync(metadata)
                         continue
                     } else if existsResult.errorCode == 404 {
                         // 404 Not Found → file does not exist

iOSClient/Utility/NCCameraRoll.swift

@@ -486,6 +486,7 @@ final class NCCameraRoll: CameraRollExtractor {
         let capturedSceneIdentifier = metadata.sceneIdentifier
         let capturedLivePhotoFile = metadata.fileName
         let capturedAssetLocalIdentifier = metadata.assetLocalIdentifier
+        let capturedAutoUploadServerUrlBase = metadata.autoUploadServerUrlBase
         let capturedSession = metadata.session
         let capturedSessionSelector = metadata.sessionSelector
         let capturedStatus = metadata.status
@@ -509,6 +510,7 @@ final class NCCameraRoll: CameraRollExtractor {
                     sceneIdentifier: capturedSceneIdentifier) { metadataLivePhoto in
                     metadataLivePhoto.livePhotoFile = capturedLivePhotoFile
                     metadataLivePhoto.assetLocalIdentifier = capturedAssetLocalIdentifier
+                    metadataLivePhoto.autoUploadServerUrlBase = capturedAutoUploadServerUrlBase
                     metadataLivePhoto.isExtractFile = true
                     metadataLivePhoto.session = capturedSession
                     metadataLivePhoto.sessionSelector = capturedSessionSelector