e2e

iOSClient/Database/NCDatabase.swift

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

iOSClient/Networking/CCNetworking.m

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

iOSClient/Security/NCEndToEndMetadata.swift

@@ -200,7 +200,7 @@ class NCEndToEndMetadata : NSObject  {
                     object.authenticationTag = filesCodable.authenticationTag
                     object.fileName = encryptedFileAttributes.filename
                     object.fileNameIdentifier = fileNameIdentifier
-                    object.fileNamePath = CCUtility.returnFileNamePath(fromFileName: encryptedFileAttributes.filename, serverUrl: serverUrl, activeUrl: url)
+                    object.fileNameIdentifierPath = serverUrl + "/" + fileNameIdentifier
                     object.key = encryptedFileAttributes.key
                     object.initializationVector = filesCodable.initializationVector
                     object.mimeType = encryptedFileAttributes.mimetype