update SetDirectory with fileID update DB

iOSClient/Actions/CCActions.swift

@@ -205,7 +205,7 @@ class CCActions: NSObject {
             let directory = CCUtility.stringAppendServerUrl(metadataNet.serverUrl, addFileName: metadataNet.fileName)
             let directoryTo = CCUtility.stringAppendServerUrl(metadataNet.serverUrl, addFileName: metadataNet.fileNameTo)
 
-            NCManageDatabase.sharedInstance.setDirectory(serverUrl: directory!, serverUrlTo: directoryTo!, etag: nil)
+            NCManageDatabase.sharedInstance.setDirectory(serverUrl: directory!, serverUrlTo: directoryTo!, etag: nil, fileID: nil)
             
         } else {
             

iOSClient/Database/NCDatabase.swift

@@ -119,9 +119,10 @@ class tableE2eEncryption: Object {
     @objc dynamic var fileNameIdentifier = ""
     @objc dynamic var key = ""
     @objc dynamic var initializationVector = ""
-    @objc dynamic var tokenLock = ""
     @objc dynamic var metadataKey: Int = 0
     @objc dynamic var mimeType = ""
+    @objc dynamic var serverUrl = ""
+    @objc dynamic var tokenLock = ""
     @objc dynamic var version: Int = 0
     
     override static func primaryKey() -> String {

iOSClient/Database/NCManageDatabase.swift

@@ -765,7 +765,7 @@ class NCManageDatabase: NSObject {
         }
     }
     
-    @objc func setDirectory(serverUrl: String, serverUrlTo: String?, etag: String?) {
+    @objc func setDirectory(serverUrl: String, serverUrlTo: String?, etag: String?, fileID: String?) {
         
         guard let tableAccount = self.getAccountActive() else {
             return
@@ -787,6 +787,9 @@ class NCManageDatabase: NSObject {
                 if let etag = etag {
                     result.etag = etag
                 }
+                if let fileID = fileID {
+                    result.fileID = fileID
+                }
             }
         } catch let error {
             print("[LOG] Could not write to database: ", error)

iOSClient/Main/CCMain.m

@@ -1786,7 +1786,7 @@
         
     } else {
         
-        [[NCManageDatabase sharedInstance] setDirectoryWithServerUrl:metadataNet.serverUrl serverUrlTo:nil etag:metadataFolder.etag];
+        [[NCManageDatabase sharedInstance] setDirectoryWithServerUrl:metadataNet.serverUrl serverUrlTo:nil etag:metadataFolder.etag fileID:metadataFolder.fileID];
         
         [[NCManageDatabase sharedInstance] deleteMetadataWithPredicate:[NSPredicate predicateWithFormat:@"account = %@ AND directoryID = %@ AND session = ''", metadataNet.account, metadataNet.directoryID] clearDateReadDirectoryID:metadataNet.directoryID];
         

iOSClient/Move/CCMove.m

@@ -325,7 +325,7 @@
     NSMutableArray *metadatasToInsertInDB = [NSMutableArray new];
  
     // Update directory etag
-    [[NCManageDatabase sharedInstance] setDirectoryWithServerUrl:metadataNet.serverUrl serverUrlTo:nil etag:metadataFolder.etag];
+    [[NCManageDatabase sharedInstance] setDirectoryWithServerUrl:metadataNet.serverUrl serverUrlTo:nil etag:metadataFolder.etag fileID:metadataFolder.fileID];
     
     for (tableMetadata *metadata in metadatas) {
         

iOSClient/Networking/CCNetworking.m

@@ -898,6 +898,7 @@
             addObject.mimeType = @"application/octet-stream";
         }
         
+        addObject.serverUrl = metadataNet.serverUrl;
         addObject.version = [[NCManageDatabase sharedInstance] getEndToEndEncryptionVersion];
         
         result = [[NCManageDatabase sharedInstance] addE2eEncryption:addObject];
@@ -1123,6 +1124,10 @@
         // OOOOOOKKKK remove record on Table Auto Upload
         [[NCManageDatabase sharedInstance] deleteQueueUploadWithAssetLocalIdentifier:assetLocalIdentifier selector:selector];
         
+        // If
+        NSString *fileNamePathServer = [CCUtility returnFileNamePathFromFileName:fileName serverUrl:serverUrl activeUrl:_activeUrl];
+        
+        
         // Manage uploadTask cancel,suspend,resume
         if (taskStatus == k_taskStatusCancel) [uploadTask cancel];
         else if (taskStatus == k_taskStatusSuspend) [uploadTask suspend];
@@ -1563,18 +1568,20 @@
 - (id)init
 {
     self = [super init];
+    
     self.priority = NSOperationQueuePriorityNormal;
+    self.fileNameIdentifier = @"";
+    
     return self;
 }
 
 - (id)initWithAccount:(NSString *)withAccount
 {
-    self = [super init];
+    self = [self init];
     
     if (self) {
-        
+
         _account = withAccount;
-        _priority = NSOperationQueuePriorityNormal;
     }
     
     return self;

iOSClient/Synchronize/CCSynchronize.m

@@ -100,7 +100,7 @@
     
     // Add metadata and update etag Directory
     (void)[[NCManageDatabase sharedInstance] addMetadata:metadataFolder];
-    [[NCManageDatabase sharedInstance] setDirectoryWithServerUrl:metadataNet.serverUrl serverUrlTo:nil etag:metadataFolder.etag];
+    [[NCManageDatabase sharedInstance] setDirectoryWithServerUrl:metadataNet.serverUrl serverUrlTo:nil etag:metadataFolder.etag fileID:metadataFolder.fileID];
 
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_LOW, 0), ^{