change rev to etag

iOSClient/AppDelegate.m

@@ -1647,7 +1647,7 @@
         
         NSArray *listAccount = [CCCoreData getAllAccount];
         for (TableAccount *account in listAccount)
-            [[NCManageDatabase sharedInstance] addTableAccountOldDB:account];
+            [[NCManageDatabase sharedInstance] addTableAccountFromCoredata:account];
     }
     
     return YES;

iOSClient/Database/NCDatabase.swift

@@ -116,7 +116,7 @@ class tableDirectory: Object {
     dynamic var lock : Bool = false
     dynamic var offline : Bool = false
     dynamic var permissions = ""
-    dynamic var rev = ""
+    dynamic var etag = ""
     dynamic var serverUrl = ""
     dynamic var synchronized: Bool = false
     
@@ -159,8 +159,7 @@ class tableLocalFile: Object {
     dynamic var fileID = ""
     dynamic var fileName = ""
     dynamic var fileNamePrint = ""
-    dynamic var offline : Bool = false
-    dynamic var rev = ""
+    dynamic var etag = ""
     dynamic var size : Double = 0
     
     override static func primaryKey() -> String {
@@ -187,7 +186,7 @@ class tableMetadata: Object {
     dynamic var nameCurrentDevice = ""
     dynamic var permissions = ""
     dynamic var protocolCrypto = ""
-    dynamic var rev = ""
+    dynamic var etag = ""
     dynamic var session = ""
     dynamic var sessionError = ""
     dynamic var sessionID = ""

iOSClient/Database/NCManageDatabase.swift

@@ -144,66 +144,6 @@ class NCManageDatabase: NSObject {
         try! realm.commitWrite()
     }
     
-    func addTableAccountOldDB(_ table: TableAccount) {
-        
-        let realm = try! Realm()
-        
-        let results = realm.objects(tableAccount.self).filter("account = %@", table.account!)
-        if (results.count == 0) {
-        
-            try! realm.write {
-                
-                let addAccount = tableAccount()
-                
-                addAccount.account = table.account!
-                if table.active == 1 {
-                    addAccount.active = true
-                }
-                if table.cameraUpload == 1 {
-                    addAccount.cameraUpload = true
-                }
-                if table.cameraUploadBackground == 1 {
-                    addAccount.cameraUploadBackground = true
-                }
-                if table.cameraUploadCreateSubfolder == 1 {
-                    addAccount.cameraUploadCreateSubfolder = true
-                }
-                if table.cameraUploadDatePhoto != nil {
-                    addAccount.cameraUploadDatePhoto = table.cameraUploadDatePhoto! as NSDate
-                }
-                if table.cameraUploadDateVideo != nil {
-                    addAccount.cameraUploadDateVideo = table.cameraUploadDateVideo! as NSDate
-                }
-                if table.cameraUploadFolderName != nil {
-                    addAccount.cameraUploadFolderName = table.cameraUploadFolderName!
-                }
-                if table.cameraUploadFolderPath != nil {
-                    addAccount.cameraUploadFolderPath = table.cameraUploadFolderPath!
-                }
-                if table.cameraUploadFull == 1 {
-                    addAccount.cameraUploadFull = true
-                }
-                if table.cameraUploadPhoto == 1 {
-                    addAccount.cameraUploadPhoto = true
-                }
-                if table.cameraUploadVideo == 1 {
-                    addAccount.cameraUploadVideo = true
-                }
-                if table.cameraUploadWWAnPhoto == 1 {
-                    addAccount.cameraUploadWWAnPhoto = true
-                }
-                if table.cameraUploadWWAnVideo == 1 {
-                    addAccount.cameraUploadWWAnVideo = true
-                }
-                addAccount.password = table.password!
-                addAccount.url = table.url!
-                addAccount.user = table.user!
-                
-                realm.add(addAccount)
-            }
-        }
-    }
-
     func setAccountPassword(_ account: String, password: String) {
         
         let realm = try! Realm()
@@ -913,7 +853,7 @@ class NCManageDatabase: NSObject {
                 if results!.count > 0 {
                     
                     results![0].dateReadDirectory = nil
-                    results![0].rev = ""
+                    results![0].etag = ""
                     realm.add(results!, update: true)
                 }
             }
@@ -1036,7 +976,7 @@ class NCManageDatabase: NSObject {
             
             for result in results {
                 result.dateReadDirectory = nil;
-                result.rev = ""
+                result.etag = ""
             }
         }
     }
@@ -1214,7 +1154,7 @@ class NCManageDatabase: NSObject {
             addLocaFile.exifLongitude = "-1"
             addLocaFile.fileName = metadata.fileName
             addLocaFile.fileNamePrint = metadata.fileNamePrint
-            addLocaFile.rev = metadata.rev
+            addLocaFile.etag = metadata.etag
             addLocaFile.size = metadata.size
             
             realm.add(addLocaFile, update: true)
@@ -1901,5 +1841,68 @@ class NCManageDatabase: NSObject {
         return [sharesLink, sharesUserAndGroup]
     }
     
+    //MARK: -
+    //MARK: Migrate func
+    
+    func addTableAccountFromCoredata(_ table: TableAccount) {
+        
+        let realm = try! Realm()
+        
+        let results = realm.objects(tableAccount.self).filter("account = %@", table.account!)
+        if (results.count == 0) {
+            
+            try! realm.write {
+                
+                let addAccount = tableAccount()
+                
+                addAccount.account = table.account!
+                if table.active == 1 {
+                    addAccount.active = true
+                }
+                if table.cameraUpload == 1 {
+                    addAccount.cameraUpload = true
+                }
+                if table.cameraUploadBackground == 1 {
+                    addAccount.cameraUploadBackground = true
+                }
+                if table.cameraUploadCreateSubfolder == 1 {
+                    addAccount.cameraUploadCreateSubfolder = true
+                }
+                if table.cameraUploadDatePhoto != nil {
+                    addAccount.cameraUploadDatePhoto = table.cameraUploadDatePhoto! as NSDate
+                }
+                if table.cameraUploadDateVideo != nil {
+                    addAccount.cameraUploadDateVideo = table.cameraUploadDateVideo! as NSDate
+                }
+                if table.cameraUploadFolderName != nil {
+                    addAccount.cameraUploadFolderName = table.cameraUploadFolderName!
+                }
+                if table.cameraUploadFolderPath != nil {
+                    addAccount.cameraUploadFolderPath = table.cameraUploadFolderPath!
+                }
+                if table.cameraUploadFull == 1 {
+                    addAccount.cameraUploadFull = true
+                }
+                if table.cameraUploadPhoto == 1 {
+                    addAccount.cameraUploadPhoto = true
+                }
+                if table.cameraUploadVideo == 1 {
+                    addAccount.cameraUploadVideo = true
+                }
+                if table.cameraUploadWWAnPhoto == 1 {
+                    addAccount.cameraUploadWWAnPhoto = true
+                }
+                if table.cameraUploadWWAnVideo == 1 {
+                    addAccount.cameraUploadWWAnVideo = true
+                }
+                addAccount.password = table.password!
+                addAccount.url = table.url!
+                addAccount.user = table.user!
+                
+                realm.add(addAccount)
+            }
+        }
+    }
+
     //MARK: -
 }

iOSClient/Favorites/CCSynchronize.m

@@ -280,11 +280,11 @@
                 
                 tableDirectory *tableDirectory = [[NCManageDatabase sharedInstance] getTableDirectoryWithPredicate:[NSPredicate predicateWithFormat:@"account = %@ AND serverUrl = %@", metadataNet.account, serverUrl]];
                 
-                if (![tableDirectory.rev isEqualToString:metadata.rev]) {
+                if (![tableDirectory.etag isEqualToString:metadata.etag]) {
                     
                     [self readFolderServerUrl:serverUrl directoryID:directoryID selector:metadataNet.selector];
                     
-                    [[NCManageDatabase sharedInstance] setDirectoryWithServerUrl:serverUrl serverUrlTo:nil fileID:metadata.rev];                    
+                    [[NCManageDatabase sharedInstance] setDirectoryWithServerUrl:serverUrl serverUrlTo:nil fileID:metadata.etag];
                 }
                 
             } else {
@@ -397,12 +397,12 @@
         
         if (withDownload) {
             
-            if (![localFile.rev isEqualToString:metadata.rev])
+            if (![localFile.etag isEqualToString:metadata.etag])
                 changeRev = YES;
             
         } else {
             
-            if (localFile && ![localFile.rev isEqualToString:metadata.rev]) // it must be in TableRecord
+            if (localFile && ![localFile.etag isEqualToString:metadata.etag]) // it must be in TableRecord
                 changeRev = YES;
         }
         

iOSClient/Main/CCMain.m

@@ -2193,7 +2193,7 @@
         metadataNet.action = actionUploadTemplate;
         metadataNet.fileName = [CCUtility trasformedFileNamePlistInCrypto:fileNameModel];
         metadataNet.fileNamePrint = fileName;
-        metadataNet.rev = metadata.rev;
+        metadataNet.etag = metadata.etag;
         metadataNet.serverUrl = [[NCManageDatabase sharedInstance] getServerUrl:metadata.directoryID];
         metadataNet.session = k_upload_session_foreground;
         metadataNet.taskStatus = k_taskStatusResume;
@@ -2302,7 +2302,7 @@
             metadataNet.fileName = metadata.fileName;
             metadataNet.fileNamePrint = metadataNet.fileNamePrint;
             metadataNet.fileNameTo = metadata.fileName;
-            metadataNet.rev = metadata.rev;
+            metadataNet.etag = metadata.etag;
             metadataNet.selector = selectorMove;
             metadataNet.serverUrl = [[NCManageDatabase sharedInstance] getServerUrl:metadata.directoryID];
             metadataNet.serverUrlTo = serverUrlTo;
@@ -2323,7 +2323,7 @@
             metadataNet.directoryID = metadata.directoryID;
             metadataNet.directoryIDTo = [[NCManageDatabase sharedInstance] getDirectoryID:serverUrlTo];
             metadataNet.fileNamePrint = metadata.fileNamePrint;
-            metadataNet.rev = metadata.rev;
+            metadataNet.etag = metadata.etag;
             metadataNet.serverUrl = [[NCManageDatabase sharedInstance] getServerUrl:metadata.directoryID];
             metadataNet.serverUrlTo = serverUrlTo;
             

iOSClient/Networking/CCNetworking.h

@@ -106,6 +106,7 @@
 @property BOOL downloadPlist;
 @property NSInteger errorCode;
 @property NSInteger errorRetry;
+@property (nonatomic, strong) NSString *etag;
 @property (nonatomic, strong) NSString *expirationTime;
 @property (nonatomic, strong) NSString *fileID;
 @property (nonatomic, strong) NSString *fileName;
@@ -118,7 +119,6 @@
 @property (nonatomic, strong) NSString *pathFolder;
 @property NSInteger priority;
 @property (nonatomic, strong) NSOperationQueue *queue;
-@property (nonatomic, strong) NSString *rev;
 @property (nonatomic, strong) NSString *serverUrl;
 @property (nonatomic, strong) NSString *serverUrlTo;
 @property (nonatomic, strong) NSString *selector;

iOSClient/Networking/CCNetworking.m

@@ -408,13 +408,13 @@
             
             if (!metadata) return;
             
-            NSString *rev = metadata.rev;
+            NSString *etag = metadata.etag;
             NSString *fileID = metadata.fileID;
             NSDictionary *fields = [httpResponse allHeaderFields];
             
             if (errorCode == 0) {
             
-                rev = [CCUtility removeForbiddenCharactersFileSystem:[fields objectForKey:@"OC-ETag"]];
+                etag = [CCUtility removeForbiddenCharactersFileSystem:[fields objectForKey:@"OC-ETag"]];
                 date = [dateFormatter dateFromString:[fields objectForKey:@"Date"]];
 
                 // Activity
@@ -429,7 +429,7 @@
             NSArray *object = [[NSArray alloc] initWithObjects:session, fileID, task, nil];
             [[NSNotificationCenter defaultCenter] postNotificationName:k_networkingSessionNotification object:object];
                 
-            [self downloadFileSuccessFailure:fileName fileID:metadata.fileID rev:rev date:date serverUrl:serverUrl selector:metadata.sessionSelector selectorPost:metadata.sessionSelectorPost errorCode:errorCode];
+            [self downloadFileSuccessFailure:fileName fileID:metadata.fileID etag:etag date:date serverUrl:serverUrl selector:metadata.sessionSelector selectorPost:metadata.sessionSelectorPost errorCode:errorCode];
         });
     }
     
@@ -445,12 +445,12 @@
             
             NSDictionary *fields = [httpResponse allHeaderFields];
             __block NSString *fileID = metadata.fileID;
-            __block NSString *rev = metadata.rev;
+            __block NSString *etag = metadata.etag;
             
             if (errorCode == 0) {
             
                 fileID = [CCUtility removeForbiddenCharactersFileSystem:[fields objectForKey:@"OC-FileId"]];
-                rev = [CCUtility removeForbiddenCharactersFileSystem:[fields objectForKey:@"OC-ETag"]];
+                etag = [CCUtility removeForbiddenCharactersFileSystem:[fields objectForKey:@"OC-ETag"]];
                 date = [dateFormatter dateFromString:[fields objectForKey:@"Date"]];
             
                 // Activity
@@ -465,7 +465,7 @@
             NSArray *object = [[NSArray alloc] initWithObjects:session, fileID, task, nil];
             [[NSNotificationCenter defaultCenter] postNotificationName:k_networkingSessionNotification object:object];
                 
-            [self uploadFileSuccessFailure:metadata fileName:fileName fileID:fileID rev:rev date:date serverUrl:serverUrl errorCode:errorCode];
+            [self uploadFileSuccessFailure:metadata fileName:fileName fileID:fileID etag:etag date:date serverUrl:serverUrl errorCode:errorCode];
         });
     }
 }
@@ -648,7 +648,7 @@
     }
 }
 
-- (void)downloadFileSuccessFailure:(NSString *)fileName fileID:(NSString *)fileID rev:(NSString *)rev date:(NSDate *)date serverUrl:(NSString *)serverUrl selector:(NSString *)selector selectorPost:(NSString *)selectorPost errorCode:(NSInteger)errorCode
+- (void)downloadFileSuccessFailure:(NSString *)fileName fileID:(NSString *)fileID etag:(NSString *)etag date:(NSDate *)date serverUrl:(NSString *)serverUrl selector:(NSString *)selector selectorPost:(NSString *)selectorPost errorCode:(NSInteger)errorCode
 {
 #ifndef EXTENSION
     if (fileID)
@@ -1362,7 +1362,7 @@
     });
 }
 
-- (void)uploadFileSuccessFailure:(tableMetadata *)metadata fileName:(NSString *)fileName fileID:(NSString *)fileID rev:(NSString *)rev date:(NSDate *)date serverUrl:(NSString *)serverUrl errorCode:(NSInteger)errorCode
+- (void)uploadFileSuccessFailure:(tableMetadata *)metadata fileName:(NSString *)fileName fileID:(NSString *)fileID etag:(NSString *)etag date:(NSDate *)date serverUrl:(NSString *)serverUrl errorCode:(NSInteger)errorCode
 {
     NSString *sessionID = metadata.sessionID;
     
@@ -1403,7 +1403,7 @@
         [CCUtility copyFileAtPath:[NSString stringWithFormat:@"%@/%@.ico", _directoryUser, sessionID] toPath:[NSString stringWithFormat:@"%@/%@.ico", _directoryUser, fileID]];
         
         metadata.fileID = fileID;
-        metadata.rev = rev;
+        metadata.etag = etag;
         metadata.date = date;
         metadata.sessionTaskIdentifierPlist = k_taskIdentifierDone;
         
@@ -1711,7 +1711,7 @@
         
     } else {
         
-        [self uploadFileSuccessFailure:metadataTemp fileName:metadataNet.fileName fileID:metadata.fileID rev:metadata.rev date:metadata.date serverUrl:metadataNet.serverUrl errorCode:0];
+        [self uploadFileSuccessFailure:metadataTemp fileName:metadataNet.fileName fileID:metadata.fileID etag:metadata.etag date:metadata.date serverUrl:metadataNet.serverUrl errorCode:0];
     }
 }
 
@@ -1738,7 +1738,7 @@
     
     // fix CCNetworking.m line 1340 2.17.2 (00005)
     if (metadata)
-        [self uploadFileSuccessFailure:metadata fileName:metadataNet.fileName fileID:metadata.fileID rev:metadata.rev date:metadata.date serverUrl:metadataNet.serverUrl errorCode:error];
+        [self uploadFileSuccessFailure:metadata fileName:metadataNet.fileName fileID:metadata.fileID etag:metadata.etag date:metadata.date serverUrl:metadataNet.serverUrl errorCode:error];
 }
 
 #pragma --------------------------------------------------------------------------------------------
@@ -1822,6 +1822,7 @@
     [metadataNet setDownloadPlist: self.downloadPlist];
     [metadataNet setErrorCode: self.errorCode];
     [metadataNet setErrorRetry: self.errorRetry];
+    [metadataNet setEtag:self.etag];
     [metadataNet setExpirationTime: self.expirationTime];
     [metadataNet setFileID: self.fileID];
     [metadataNet setFileName: self.fileName];
@@ -1833,7 +1834,6 @@
     [metadataNet setPathFolder: self.pathFolder];
     [metadataNet setPriority: self.priority];
     [metadataNet setQueue: self.queue];
-    [metadataNet setRev:self.rev];
     [metadataNet setServerUrl: self.serverUrl];
     [metadataNet setServerUrlTo: self.serverUrlTo];
     [metadataNet setSelector: self.selector];

iOSClient/Utility/CCUtility.m

@@ -796,7 +796,7 @@
     metadata.nameCurrentDevice = [CCUtility getNameCurrentDevice];
     metadata.permissions = itemDto.permissions;
     metadata.protocolCrypto = @"";
-    metadata.rev = itemDto.etag;
+    metadata.etag = itemDto.etag;
     metadata.size = itemDto.size;
     metadata.sessionTaskIdentifier = k_taskIdentifierDone;
     metadata.sessionTaskIdentifierPlist = k_taskIdentifierDone;