restore primary key

iOSClient/Database/NCDatabase.swift

@@ -119,7 +119,7 @@ class tableE2eEncryption: Object {
     @objc dynamic var authenticationTag = ""
     @objc dynamic var fileName = ""
     @objc dynamic var fileNameIdentifier = ""
-    @objc dynamic var fileNameIdentifierPath = ""
+    @objc dynamic var fileNamePath = ""
     @objc dynamic var key = ""
     @objc dynamic var initializationVector = ""
     @objc dynamic var metadataKey = ""
@@ -129,7 +129,7 @@ class tableE2eEncryption: Object {
     @objc dynamic var version: Int = 1
     
     override static func primaryKey() -> String {
-        return "fileNameIdentifierPath"
+        return "fileNamePath"
     }
 }
 

iOSClient/Networking/CCNetworking.m

@@ -1649,7 +1649,7 @@
         addObject.authenticationTag = authenticationTag;
         addObject.fileName = fileName;
         addObject.fileNameIdentifier = fileNameIdentifier;
-        addObject.fileNameIdentifierPath = [NSString stringWithFormat:@"%@/%@", serverUrl, fileNameIdentifier];
+        addObject.fileNamePath = [CCUtility returnFileNamePathFromFileName:fileName serverUrl:serverUrl activeUrl:_activeUrl];
         addObject.key = key;
         addObject.initializationVector = initializationVector;
         addObject.metadataKey = metadataKey;

iOSClient/Security/NCEndToEndMetadata.swift

@@ -201,8 +201,8 @@ class NCEndToEndMetadata : NSObject  {
                         object.authenticationTag = filesCodable.authenticationTag
                         object.fileName = encryptedFileAttributes.filename
                         object.fileNameIdentifier = fileNameIdentifier
-                        object.fileNameIdentifierPath = serverUrl + "/" + fileNameIdentifier
-                        object.key = encryptedFileAttributes.key
+                        object.fileNamePath = CCUtility.returnFileNamePath(fromFileName: encryptedFileAttributes.filename, serverUrl: serverUrl, activeUrl: url)
+                                                object.key = encryptedFileAttributes.key
                         object.initializationVector = filesCodable.initializationVector
                         object.metadataKey = metadataKey!
                         object.metadataKeyIndex = filesCodable.metadataKey