coding

iOSClient/CCGlobal.h

@@ -168,8 +168,7 @@
 #define k_minCharsSearch                                2
 
 // Selector
-#define selectorSynchronize                             @"synchronize"
-#define selectorDownloadSynchronize                     @"downloadSynchronize"
+#define selectorDownloadFile                            @"downloadFile"
 #define selectorLoadFileView                            @"loadFileView"
 #define selectorLoadFileViewFavorite                    @"loadFileViewFavorite"
 #define selectorLoadFileQuickLook                       @"loadFileQuickLook"
@@ -177,7 +176,7 @@
 #define selectorLoadOffline                             @"loadOffline"
 #define selectorOpenIn                                  @"openIn"
 #define selectorOpenInDetail                            @"openInDetail"
-#define selectorSave                                    @"save"
+#define selectorSaveAlbum                               @"saveAlbum"
 #define selectorUploadAutoUpload                        @"uploadAutoUpload"
 #define selectorUploadAutoUploadAll                     @"uploadAutoUploadAll"
 #define selectorUploadFile                              @"uploadFile"

iOSClient/Main/CCMain.m

@@ -908,7 +908,7 @@
             
             if (metadata.directory == NO && ([metadata.typeFile isEqualToString: k_metadataTypeFile_image] || [metadata.typeFile isEqualToString: k_metadataTypeFile_video])) {
                 
-                [[NCOperationQueue shared] downloadWithMetadata:metadata selector:selectorSave setFavorite:false];                
+                [[NCOperationQueue shared] downloadWithMetadata:metadata selector:selectorSaveAlbum setFavorite:false];
             }
         }
         

iOSClient/Networking/NCNetworkingNotificationCenter.swift

@@ -58,7 +58,7 @@ import Foundation
                 if errorCode == 0 {
                     
                     // Synchronized
-                    if selector == selectorDownloadSynchronize {
+                    if selector == selectorDownloadFile {
                         return
                     }
                     
@@ -132,7 +132,7 @@ import Foundation
                     }
                     
                     // Save to Photo Album
-                    if selector == selectorSave {
+                    if selector == selectorSaveAlbum {
                         appDelegate.activeMain.save(toPhotoAlbum: metadata)
                     }
                     

iOSClient/Networking/NCOperationQueue.swift

@@ -158,7 +158,7 @@ class NCOperationSynchronization: ConcurrentOperation {
     init(metadata: tableMetadata, selector: String) {
         self.metadata = metadata
         self.selector = selector
-        if selector == selectorDownloadSynchronize {
+        if selector == selectorDownloadFile {
             self.download = true
         } else {
             self.download = false
@@ -180,7 +180,7 @@ class NCOperationSynchronization: ConcurrentOperation {
                                 if self.download {
                                     for metadata in metadatasChanged {
                                         if metadata.directory == false {
-                                            NCOperationQueue.shared.download(metadata: metadata, selector: selectorSave, setFavorite: false)
+                                            NCOperationQueue.shared.download(metadata: metadata, selector: self.selector, setFavorite: false)
                                         }
                                     }
                                 }
@@ -193,7 +193,7 @@ class NCOperationSynchronization: ConcurrentOperation {
                 }
             } else {
                 if self.download {
-                    NCOperationQueue.shared.download(metadata: metadata, selector: selectorSave, setFavorite: false)
+                    NCOperationQueue.shared.download(metadata: metadata, selector: self.selector, setFavorite: false)
                 }
                 self.finish()
             }

iOSClient/Networking/NCService.swift

@@ -79,7 +79,7 @@ class NCService: NSObject {
                         guard let metadata = NCManageDatabase.sharedInstance.getMetadata(predicate: NSPredicate(format: "ocId == %@", directory.ocId)) else {
                             continue
                         }
-                        NCOperationQueue.shared.synchronizationMetadata(metadata, selector: selectorDownloadSynchronize)
+                        NCOperationQueue.shared.synchronizationMetadata(metadata, selector: selectorDownloadFile)
                     }
                 }
                 
@@ -88,7 +88,7 @@ class NCService: NSObject {
                     guard let metadata = NCManageDatabase.sharedInstance.getMetadata(predicate: NSPredicate(format: "ocId == %@", file.ocId)) else {
                         continue
                     }
-                    NCOperationQueue.shared.synchronizationMetadata(metadata, selector: selectorDownloadSynchronize)
+                    NCOperationQueue.shared.synchronizationMetadata(metadata, selector: selectorDownloadFile)
                 }
                                         
                 let avatarUrl = "\(self.appDelegate.urlBase!)/index.php/avatar/\(self.appDelegate.user!)/\(k_avatar_size)".addingPercentEncoding(withAllowedCharacters: .urlFragmentAllowed)!