cenge field name e2e

iOSClient/Actions/CCActions.swift

@@ -211,7 +211,7 @@ class CCActions: NSObject {
                 return
             }
             
-            NCManageDatabase.sharedInstance.setDirectory(serverUrl: directory!, serverUrlTo: directoryTo!, etag: nil, fileID: nil, encrypted: directoryTable.encrypted)
+            NCManageDatabase.sharedInstance.setDirectory(serverUrl: directory!, serverUrlTo: directoryTo!, etag: nil, fileID: nil, encrypted: directoryTable.e2eEncrypted)
             
         } else {
             

iOSClient/Database/NCDatabase.swift

@@ -99,12 +99,13 @@ class tableDirectory: Object {
     @objc dynamic var account = ""
     @objc dynamic var dateReadDirectory: NSDate? = nil
     @objc dynamic var directoryID = ""
-    @objc dynamic var encrypted: Bool = false
+    @objc dynamic var e2eEncrypted: Bool = false
+    @objc dynamic var e2eMetadataJSON = ""
     @objc dynamic var etag = ""
     @objc dynamic var favorite: Bool = false
     @objc dynamic var fileID = ""
     @objc dynamic var lock: Bool = false
-    @objc dynamic var tokenLock = ""
+    @objc dynamic var e2eTokenLock = ""
     @objc dynamic var permissions = ""
     @objc dynamic var serverUrl = ""
     
@@ -178,7 +179,7 @@ class tableMetadata: Object {
     @objc dynamic var date = NSDate()
     @objc dynamic var directory: Bool = false
     @objc dynamic var directoryID = ""
-    @objc dynamic var encrypted: Bool = false
+    @objc dynamic var e2eEncrypted: Bool = false
     @objc dynamic var etag = ""
     @objc dynamic var favorite: Bool = false
     @objc dynamic var fileID = ""

iOSClient/Database/NCManageDatabase.swift

@@ -711,7 +711,7 @@ class NCManageDatabase: NSObject {
                 
                     directoryID = NSUUID().uuidString
                     addObject.directoryID = directoryID
-                    addObject.encrypted = encrypted
+                    addObject.e2eEncrypted = encrypted
                 
                     if let permissions = permissions {
                         addObject.permissions = permissions
@@ -725,7 +725,7 @@ class NCManageDatabase: NSObject {
                         result!.permissions = permissions
                     }
                     directoryID = result!.directoryID
-                    result!.encrypted = encrypted
+                    result!.e2eEncrypted = encrypted
                     realm.add(result!, update: true)
                 }
             }
@@ -780,7 +780,7 @@ class NCManageDatabase: NSObject {
                     return
                 }
                 
-                result.encrypted = encrypted
+                result.e2eEncrypted = encrypted
                 if let serverUrlTo = serverUrlTo {
                     result.serverUrl = serverUrlTo
 
@@ -912,7 +912,7 @@ class NCManageDatabase: NSObject {
             return nil
         }
         
-        return result.tokenLock
+        return result.e2eTokenLock
     }
     
     @objc func setDateReadDirectory(directoryID: String) {
@@ -1028,7 +1028,7 @@ class NCManageDatabase: NSObject {
             return
         }
         
-        result.tokenLock = token
+        result.e2eTokenLock = token
         
         do {
             try realm.commitWrite()

iOSClient/Main/CCMain.m

@@ -1285,7 +1285,7 @@
     
     tableE2eEncryption *e2eEncryption = [[NCManageDatabase sharedInstance] getE2eEncryptionWithPredicate:[NSPredicate predicateWithFormat:@"fileNameIdentifier = %@ AND serverUrl = %@", metadata.fileName, serverUrl]];
     if (e2eEncryption) {
-        metadata.encrypted = true;
+        metadata.e2eEncrypted = true;
         metadata.fileName = e2eEncryption.fileName;
         [CCUtility insertTypeFileIconName:metadata.fileName metadata:metadata];
     }
@@ -1744,7 +1744,7 @@
         
     } else {
         
-        [[NCManageDatabase sharedInstance] setDirectoryWithServerUrl:metadataNet.serverUrl serverUrlTo:nil etag:metadataFolder.etag fileID:metadataFolder.fileID encrypted:metadataFolder.encrypted];
+        [[NCManageDatabase sharedInstance] setDirectoryWithServerUrl:metadataNet.serverUrl serverUrlTo:nil etag:metadataFolder.etag fileID:metadataFolder.fileID encrypted:metadataFolder.e2eEncrypted];
         
         [[NCManageDatabase sharedInstance] deleteMetadataWithPredicate:[NSPredicate predicateWithFormat:@"account = %@ AND directoryID = %@ AND session = ''", metadataNet.account, metadataNet.directoryID] clearDateReadDirectoryID:metadataNet.directoryID];
         
@@ -1808,7 +1808,7 @@
     }
     
     // Is encrypted folder get metadata
-    if (metadataFolder.encrypted == true) {
+    if (metadataFolder.e2eEncrypted == true) {
         
         if ([CCUtility isEndToEndEnabled:app.activeAccount]) {
             
@@ -4033,7 +4033,7 @@
         }
         
 #ifdef DEBUG
-        if ([CCUtility isEndToEndEnabled:app.activeAccount] && !_metadata.encrypted) {
+        if ([CCUtility isEndToEndEnabled:app.activeAccount] && !_metadata.e2eEncrypted) {
             
             [actionSheet addButtonWithTitle:NSLocalizedString(@"_e2e_set_folder_encrypted_", nil)
                                       image:[UIImage imageNamed:@"encrypted_empty"]
@@ -4054,7 +4054,7 @@
                                     }];
         }
         
-        if ([CCUtility isEndToEndEnabled:app.activeAccount] && _metadata.encrypted) {
+        if ([CCUtility isEndToEndEnabled:app.activeAccount] && _metadata.e2eEncrypted) {
             
             [actionSheet addButtonWithTitle:NSLocalizedString(@"_e2e_remove_folder_encrypted_", nil)
                                       image:[UIImage imageNamed:@"encrypted_empty"]
@@ -4686,7 +4686,7 @@
         
         if (metadata.directory) {
             
-            if (metadata.encrypted)
+            if (metadata.e2eEncrypted)
                 cell.file.image = [CCGraphics changeThemingColorImage:[UIImage imageNamed:@"folderEncrypted"] color:[NCBrandColor sharedInstance].brand];
             else if ([metadata.fileName isEqualToString:_autoUploadFileName] && [self.serverUrl isEqualToString:_autoUploadDirectory])
                 cell.file.image = [CCGraphics changeThemingColorImage:[UIImage imageNamed:@"folderphotocamera"] color:[NCBrandColor sharedInstance].brand];

iOSClient/Main/CCSection.m

@@ -76,7 +76,7 @@
         // Is a Encrypted metadata ?
         for (tableE2eEncryption *e2eEncryption in e2eEncryptions) {
             if ([metadata.fileName isEqualToString:e2eEncryption.fileNameIdentifier]) {
-                metadata.encrypted = true;
+                metadata.e2eEncrypted = true;
                 metadata.fileNameView = e2eEncryption.fileName;
                 [CCUtility insertTypeFileIconName:metadata.fileNameView metadata:metadata];
                 break;

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 fileID:metadataFolder.fileID encrypted:metadataFolder.encrypted];
+    [[NCManageDatabase sharedInstance] setDirectoryWithServerUrl:metadataNet.serverUrl serverUrlTo:nil etag:metadataFolder.etag fileID:metadataFolder.fileID encrypted:metadataFolder.e2eEncrypted];
     
     for (tableMetadata *metadata in metadatas) {
         

iOSClient/Networking/CCNetworking.m

@@ -937,7 +937,7 @@
         
         // Now the fileName is fileNameIdentifier
         metadata.fileName = fileNameIdentifier;
-        metadata.encrypted = true;
+        metadata.e2eEncrypted = true;
     }
     
     // File exists ???

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 fileID:metadataFolder.fileID encrypted:metadataFolder.encrypted];
+    [[NCManageDatabase sharedInstance] setDirectoryWithServerUrl:metadataNet.serverUrl serverUrlTo:nil etag:metadataFolder.etag fileID:metadataFolder.fileID encrypted:metadataFolder.e2eEncrypted];
 
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_LOW, 0), ^{
         

iOSClient/Utility/CCUtility.m

@@ -949,7 +949,7 @@
     
     metadata.account = activeAccount;
     metadata.date = [NSDate dateWithTimeIntervalSince1970:itemDto.date];
-    metadata.encrypted = itemDto.isEncrypted;
+    metadata.e2eEncrypted = itemDto.isEncrypted;
     metadata.directory = itemDto.isDirectory;
     metadata.favorite = itemDto.isFavorite;
     metadata.fileID = itemDto.ocId;
@@ -988,7 +988,7 @@
         
         // thumbnailExists
             
-        if (([ext isEqualToString:@"JPG"] || [ext isEqualToString:@"PNG"] || [ext isEqualToString:@"JPEG"] || [ext isEqualToString:@"GIF"] || [ext isEqualToString:@"BMP"] || [ext isEqualToString:@"MP3"]  || [ext isEqualToString:@"MOV"]  || [ext isEqualToString:@"MP4"]  || [ext isEqualToString:@"M4V"] || [ext isEqualToString:@"3GP"]) && metadata.encrypted == NO)
+        if (([ext isEqualToString:@"JPG"] || [ext isEqualToString:@"PNG"] || [ext isEqualToString:@"JPEG"] || [ext isEqualToString:@"GIF"] || [ext isEqualToString:@"BMP"] || [ext isEqualToString:@"MP3"]  || [ext isEqualToString:@"MOV"]  || [ext isEqualToString:@"MP4"]  || [ext isEqualToString:@"M4V"] || [ext isEqualToString:@"3GP"]) && metadata.e2eEncrypted == NO)
             metadata.thumbnailExists = YES;
         else
             metadata.thumbnailExists = NO;