change DB

iOSClient/Database/NCDatabase.swift

@@ -116,7 +116,7 @@ class tableE2eEncryption: Object {
     @objc dynamic var account = ""
     @objc dynamic var authenticationTag = ""
     @objc dynamic var fileName = ""
-    @objc dynamic var fileNameEncrypted = ""
+    @objc dynamic var fileNameIdentifier = ""
     @objc dynamic var key = ""
     @objc dynamic var initializationVector = ""
     @objc dynamic var lock = ""
@@ -126,7 +126,7 @@ class tableE2eEncryption: Object {
     @objc dynamic var version: Int = 0
     
     override static func primaryKey() -> String {
-        return "fileNameEncrypted"
+        return "fileNameIdentifier"
     }
 }
 
@@ -241,7 +241,7 @@ class tableQueueUpload: Object {
     @objc dynamic var date = NSDate()
     @objc dynamic var encrypted: Bool = false
     @objc dynamic var fileName = ""
-    @objc dynamic var fileNameEncrypted = ""
+    @objc dynamic var fileNameIdentifier = ""
     @objc dynamic var lock: Bool = false
     @objc dynamic var priority: Int = 0
     @objc dynamic var selector = ""

iOSClient/Database/NCManageDatabase.swift

@@ -1918,7 +1918,7 @@ class NCManageDatabase: NSObject {
                         addObject.assetLocalIdentifier = metadataNet.assetLocalIdentifier
                         addObject.encrypted = metadataNet.encrypted
                         addObject.fileName = metadataNet.fileName
-                        addObject.fileNameEncrypted = metadataNet.fileNameEncrypted
+                        addObject.fileNameIdentifier = metadataNet.fileNameIdentifier
                         addObject.selector = metadataNet.selector
                         
                         if let selectorPost = metadataNet.selectorPost {
@@ -1963,7 +1963,7 @@ class NCManageDatabase: NSObject {
                         addObject.assetLocalIdentifier = metadataNet.assetLocalIdentifier
                         addObject.encrypted = metadataNet.encrypted
                         addObject.fileName = metadataNet.fileName
-                        addObject.fileNameEncrypted = metadataNet.fileNameEncrypted
+                        addObject.fileNameIdentifier = metadataNet.fileNameIdentifier
                         addObject.selector = metadataNet.selector
                         
                         if let selectorPost = metadataNet.selectorPost {
@@ -2004,7 +2004,7 @@ class NCManageDatabase: NSObject {
         metadataNet.assetLocalIdentifier = result.assetLocalIdentifier
         metadataNet.encrypted = result.encrypted
         metadataNet.fileName = result.fileName
-        metadataNet.fileNameEncrypted = result.fileNameEncrypted
+        metadataNet.fileNameIdentifier = result.fileNameIdentifier
         metadataNet.priority = result.priority
         metadataNet.selector = result.selector
         metadataNet.selectorPost = result.selectorPost

iOSClient/Main/CCMain.m

@@ -1647,7 +1647,7 @@
             metadataNet.encrypted = isEncrypted;
             metadataNet.fileName = fileName;
             if (isEncrypted)
-                metadataNet.fileNameEncrypted = [CCUtility generateEncryptedFileName];
+                metadataNet.fileNameIdentifier = [CCUtility generateRandomIdentifier];
             metadataNet.session = session;
             metadataNet.selector = selectorReadFileUploadFile;
             metadataNet.serverUrl = serverUrl;

iOSClient/Networking/CCNetworking.h

@@ -109,7 +109,7 @@
 @property (nonatomic, strong) NSString *expirationTime;
 @property (nonatomic, strong) NSString *fileID;
 @property (nonatomic, strong) NSString *fileName;
-@property (nonatomic, strong) NSString *fileNameEncrypted;
+@property (nonatomic, strong) NSString *fileNameIdentifier;
 @property (nonatomic, strong) NSString *fileNameTo;
 @property (nonatomic, strong) NSString *key;
 @property (nonatomic, strong) NSString *keyCipher;

iOSClient/Networking/CCNetworking.m

@@ -815,8 +815,8 @@
                             
                             addObject.account = metadataNet.account;
                             addObject.authenticationTag = authenticationTag;
-                            addObject.fileName = metadataNet.fileName;
-                            addObject.fileNameEncrypted = metadataNet.fileNameEncrypted;
+                            addObject.fileName = [CCUtility returnFileNamePathFromFileName:metadataNet.fileName serverUrl:metadataNet.serverUrl activeUrl:_activeUrl];
+                            addObject.fileNameIdentifier = metadataNet.fileNameIdentifier;
                             addObject.key = key;
                             addObject.initializationVector = initializationVector;
                             
@@ -1598,7 +1598,7 @@
     [metadataNet setExpirationTime: self.expirationTime];
     [metadataNet setFileID: self.fileID];
     [metadataNet setFileName: self.fileName];
-    [metadataNet setFileNameEncrypted: self.fileNameEncrypted];
+    [metadataNet setFileNameIdentifier: self.fileNameIdentifier];
     [metadataNet setFileNameTo: self.fileNameTo];
     [metadataNet setKey: self.key];
     [metadataNet setKeyCipher: self.keyCipher];

iOSClient/Security/NCEntoToEndInterface.swift

@@ -471,7 +471,7 @@ class NCEntoToEndInterface : NSObject, OCNetworkingDelegate  {
             
             
             let e2eMetadataFilesKey = e2eMetadata.filesKey(initializationVector: recordE2eEncryption.initializationVector, authenticationTag: recordE2eEncryption.authenticationTag, metadataKey: 0, encrypted: String(data: encryptedData, encoding: .utf8)!)
-            files.updateValue(e2eMetadataFilesKey, forKey: recordE2eEncryption.fileNameEncrypted)
+            files.updateValue(e2eMetadataFilesKey, forKey: recordE2eEncryption.fileNameIdentifier)
         }
         
         // Create "metadata"

iOSClient/Utility/CCUtility.h

@@ -183,7 +183,7 @@
 
 // ===== E2E Encrypted =====
 
-+ (NSString *)generateEncryptedFileName;
++ (NSString *)generateRandomIdentifier;
 + (BOOL)isFolderEncrypted:(NSString *)serverUrl account:(NSString *)account;
 
 // ===== CCMetadata =====

iOSClient/Utility/CCUtility.m

@@ -896,7 +896,7 @@
 #pragma mark ===== E2E Encrypted =====
 #pragma --------------------------------------------------------------------------------------------
 
-+ (NSString *)generateEncryptedFileName
++ (NSString *)generateRandomIdentifier
 {
     NSString *UUID = [[NSUUID UUID] UUIDString];