add selector on managed queueUpload

iOSClient/AutoUpload/NCAutoUpload.m

@@ -508,7 +508,7 @@
             
             [[NCManageDatabase sharedInstance] addActivityClient:metadataNet.fileName fileID:metadataNet.assetLocalIdentifier action:k_activityDebugActionUpload selector:selectorUploadAutoUploadAll note:@"Internal error image/video not found [0]" type:k_activityTypeFailure verbose:k_activityVerboseHigh activeUrl:app.activeUrl];
             
-            [[NCManageDatabase sharedInstance] deleteQueueUploadWithAssetLocalIdentifier:metadataNet.assetLocalIdentifier];
+            [[NCManageDatabase sharedInstance] deleteQueueUploadWithAssetLocalIdentifier:metadataNet.assetLocalIdentifier selector:selectorUploadAutoUpload];
         }
         
         counterUploadInQueueAndInLock = [app getNumberUploadInQueues] + [app getNumberUploadInQueuesWWan] + [[[NCManageDatabase sharedInstance] getLockQueueUpload] count];
@@ -547,7 +547,7 @@
             
                 [[NCManageDatabase sharedInstance] addActivityClient:metadataNet.fileName fileID:metadataNet.assetLocalIdentifier action:k_activityDebugActionUpload selector:selectorUploadAutoUploadAll note:@"Internal error image/video not found [0]" type:k_activityTypeFailure verbose:k_activityVerboseHigh activeUrl:app.activeUrl];
             
-                [[NCManageDatabase sharedInstance] deleteQueueUploadWithAssetLocalIdentifier:metadataNet.assetLocalIdentifier];
+                [[NCManageDatabase sharedInstance] deleteQueueUploadWithAssetLocalIdentifier:metadataNet.assetLocalIdentifier selector:selectorUploadAutoUploadAll];
             }
         
             counterUploadInQueueAndInLock = [app getNumberUploadInQueues] + [app getNumberUploadInQueuesWWan] + [[[NCManageDatabase sharedInstance] getLockQueueUpload] count];

iOSClient/Database/NCManageDatabase.swift

@@ -1614,23 +1614,23 @@ class NCManageDatabase: NSObject {
             do {
                 try realm.write {
                     
-                    if realm.objects(tableQueueUpload.self).filter("account = %@ AND assetLocalIdentifier = %@", tableAccount.account, metadataNet.assetLocalIdentifier).first == nil {
+                    if realm.objects(tableQueueUpload.self).filter("account = %@ AND assetLocalIdentifier = %@ AND selector = %@", tableAccount.account, metadataNet.assetLocalIdentifier, metadataNet.selector).first == nil {
                         
                         // Add new
-                        let addobject = tableQueueUpload()
+                        let addObject = tableQueueUpload()
                         
-                        addobject.account = tableAccount.account
-                        addobject.assetLocalIdentifier = metadataNet.assetLocalIdentifier
-                        addobject.fileName = metadataNet.fileName
-                        addobject.selector = metadataNet.selector
+                        addObject.account = tableAccount.account
+                        addObject.assetLocalIdentifier = metadataNet.assetLocalIdentifier
+                        addObject.fileName = metadataNet.fileName
+                        addObject.selector = metadataNet.selector
                         if (metadataNet.selectorPost != nil) {
-                            addobject.selectorPost = metadataNet.selectorPost
+                            addObject.selectorPost = metadataNet.selectorPost
                         }
-                        addobject.serverUrl = metadataNet.serverUrl
-                        addobject.session = metadataNet.session
-                        addobject.priority = metadataNet.priority
+                        addObject.serverUrl = metadataNet.serverUrl
+                        addObject.session = metadataNet.session
+                        addObject.priority = metadataNet.priority
                         
-                        realm.add(addobject)
+                        realm.add(addObject)
                     }
                 }
             } catch let error {
@@ -1654,23 +1654,23 @@ class NCManageDatabase: NSObject {
                 
                 for metadataNet in metadatasNet {
                     
-                    if realm.objects(tableQueueUpload.self).filter("account = %@ AND assetLocalIdentifier = %@", tableAccount.account, metadataNet.assetLocalIdentifier).first == nil {
+                    if realm.objects(tableQueueUpload.self).filter("account = %@ AND assetLocalIdentifier = %@ AND selector = %@", tableAccount.account, metadataNet.assetLocalIdentifier, metadataNet.selector).first == nil {
                         
                         // Add new
-                        let addobject = tableQueueUpload()
+                        let addObject = tableQueueUpload()
                         
-                        addobject.account = tableAccount.account
-                        addobject.assetLocalIdentifier = metadataNet.assetLocalIdentifier
-                        addobject.fileName = metadataNet.fileName
-                        addobject.selector = metadataNet.selector
+                        addObject.account = tableAccount.account
+                        addObject.assetLocalIdentifier = metadataNet.assetLocalIdentifier
+                        addObject.fileName = metadataNet.fileName
+                        addObject.selector = metadataNet.selector
                         if (metadataNet.selectorPost != nil) {
-                            addobject.selectorPost = metadataNet.selectorPost
+                            addObject.selectorPost = metadataNet.selectorPost
                         }
-                        addobject.serverUrl = metadataNet.serverUrl
-                        addobject.session = metadataNet.session
-                        addobject.priority = metadataNet.priority
+                        addObject.serverUrl = metadataNet.serverUrl
+                        addObject.session = metadataNet.session
+                        addObject.priority = metadataNet.priority
                         
-                        realm.add(addobject)
+                        realm.add(addObject)
                     }
                 }
             }
@@ -1757,7 +1757,7 @@ class NCManageDatabase: NSObject {
         }
     }
     
-    func deleteQueueUpload(assetLocalIdentifier: String) {
+    func deleteQueueUpload(assetLocalIdentifier: String, selector: String) {
         
         guard let tableAccount = self.getAccountActive() else {
             return
@@ -1768,7 +1768,7 @@ class NCManageDatabase: NSObject {
         do {
             try realm.write {
                 
-                let result = realm.objects(tableQueueUpload.self).filter("account = %@ AND assetLocalIdentifier = %@", tableAccount.account, assetLocalIdentifier).first
+                let result = realm.objects(tableQueueUpload.self).filter("account = %@ AND assetLocalIdentifier = %@ AND selector = %@", tableAccount.account, assetLocalIdentifier, selector).first
                 
                 if result != nil {
                     realm.delete(result!)

iOSClient/Networking/CCNetworking.m

@@ -861,7 +861,7 @@
                     
                 // Delete record on Table Auto Upload
                 if ([selector isEqualToString:selectorUploadAutoUpload] || [selector isEqualToString:selectorUploadAutoUploadAll])
-                    [[NCManageDatabase sharedInstance] deleteQueueUploadWithAssetLocalIdentifier:assetLocalIdentifier];
+                    [[NCManageDatabase sharedInstance] deleteQueueUploadWithAssetLocalIdentifier:assetLocalIdentifier selector:selector];
                     
                 // Activity
                 [[NCManageDatabase sharedInstance] addActivityClient:fileName fileID:assetLocalIdentifier action:k_activityDebugActionUpload selector:selector note:[NSString stringWithFormat:@"%@ [%@]",NSLocalizedString(@"_read_file_error_", nil), error.description] type:k_activityTypeFailure verbose:k_activityVerboseDefault  activeUrl:_activeUrl];
@@ -916,7 +916,7 @@
                             
                         // Delete record on Table Auto Upload
                         if ([selector isEqualToString:selectorUploadAutoUpload] || [selector isEqualToString:selectorUploadAutoUploadAll])
-                            [[NCManageDatabase sharedInstance] deleteQueueUploadWithAssetLocalIdentifier:assetLocalIdentifier];
+                            [[NCManageDatabase sharedInstance] deleteQueueUploadWithAssetLocalIdentifier:assetLocalIdentifier selector:selector];
                             
                         // Activity
                         [[NCManageDatabase sharedInstance] addActivityClient:fileName fileID:assetLocalIdentifier action:k_activityDebugActionUpload selector:selector note:[NSString stringWithFormat:@"%@ [%@]",NSLocalizedString(@"_read_file_error_", nil), error.description] type:k_activityTypeFailure verbose:k_activityVerboseDefault activeUrl:_activeUrl];
@@ -936,7 +936,7 @@
                     
                 // Delete record on Table Auto Upload
                 if ([selector isEqualToString:selectorUploadAutoUpload] || [selector isEqualToString:selectorUploadAutoUploadAll])
-                    [[NCManageDatabase sharedInstance] deleteQueueUploadWithAssetLocalIdentifier:assetLocalIdentifier];
+                    [[NCManageDatabase sharedInstance] deleteQueueUploadWithAssetLocalIdentifier:assetLocalIdentifier selector:selector];
                     
                 // Activity
                 [[NCManageDatabase sharedInstance] addActivityClient:fileName fileID:assetLocalIdentifier action:k_activityDebugActionUpload selector:selector note:[NSString stringWithFormat:@"%@ [%@]",NSLocalizedString(@"_read_file_error_", nil), error.description] type:k_activityTypeFailure verbose:k_activityVerboseDefault activeUrl:_activeUrl];
@@ -1292,7 +1292,7 @@
         
         // Delete record : Table Auto Upload
         if ([selector isEqualToString:selectorUploadAutoUpload] || [selector isEqualToString:selectorUploadAutoUploadAll])
-            [[NCManageDatabase sharedInstance] deleteQueueUploadWithAssetLocalIdentifier:assetLocalIdentifier];
+            [[NCManageDatabase sharedInstance] deleteQueueUploadWithAssetLocalIdentifier:assetLocalIdentifier selector:selector];
         
         dispatch_async(dispatch_get_main_queue(), ^{
             // Error for uploadFileFailure
@@ -1333,7 +1333,7 @@
         
         // Delete record on Table Auto Upload
         if ([selector isEqualToString:selectorUploadAutoUpload] || [selector isEqualToString:selectorUploadAutoUploadAll])
-            [[NCManageDatabase sharedInstance] deleteQueueUploadWithAssetLocalIdentifier:assetLocalIdentifier];
+            [[NCManageDatabase sharedInstance] deleteQueueUploadWithAssetLocalIdentifier:assetLocalIdentifier selector:selector];
         
         // Manage uploadTask cancel,suspend,resume
         if (taskStatus == k_taskStatusCancel) [uploadTask cancel];