coding e2ee

Signed-off-by: Marino Faggiana <marino@marinofaggiana.com>

iOSClient/Networking/E2EE/NCNetworkingE2EE.swift

@@ -34,7 +34,7 @@ class NCNetworkingE2EE: NSObject {
     func generateRandomIdentifier() -> String {
 
         var UUID = NSUUID().uuidString
-        UUID = "E2EE|" + UUID.replacingOccurrences(of: "-", with: "").uppercased() + "|E2EE"
+        UUID = "E2EE" + UUID.replacingOccurrences(of: "-", with: "")
         return UUID
     }
 

iOSClient/Networking/E2EE/NCNetworkingE2EEUpload.swift

@@ -46,7 +46,10 @@ class NCNetworkingE2EEUpload: NSObject {
         }
 
         // Create metadata for upload
-        if !(metadata.fileName.hasPrefix("E2EE|") && metadata.fileName.hasSuffix("|E2EE")) {
+
+        if let result = NCManageDatabase.shared.getMetadata(predicate: NSPredicate(format: "serverURL == %@ AND fileNameView == %@", metadata.serverUrl, metadata.fileNameView)) {
+            metadata.fileName = result.fileName
+        } else {
             metadata.fileName = NCNetworkingE2EE.shared.generateRandomIdentifier()
         }
         metadata.e2eEncrypted = true