Marino Faggiana 7 жил өмнө
parent
commit
288e22e18d

+ 1 - 1
iOSClient/Database/NCManageDatabase.swift

@@ -907,7 +907,7 @@ class NCManageDatabase: NSObject {
         
         
         let realm = try! Realm()
         let realm = try! Realm()
         
         
-        guard let result = realm.objects(tableDirectory.self).filter("account = %@ AND serverUrl = %@ AND tokenLock != ''", tableAccount.account, serverUrl).first else {
+        guard let result = realm.objects(tableDirectory.self).filter("account = %@ AND serverUrl = %@ AND e2eTokenLock != ''", tableAccount.account, serverUrl).first else {
             return nil
             return nil
         }
         }
         
         

+ 5 - 1
iOSClient/Security/NCEndToEndMetadata.swift

@@ -75,7 +75,9 @@ class NCEndToEndMetadata : NSObject  {
         var version = 1
         var version = 1
         
         
         // Generate Key
         // Generate Key
-        let key = NCEndToEndEncryption.sharedManager().generateKey(16).base64EncodedString() // AES_KEY_128_LENGTH
+        //let key = NCEndToEndEncryption.sharedManager().generateKey(16).base64EncodedString() // AES_KEY_128_LENGTH
+        let key = "LPOJLSgnHTuI9yKQVpaqSA=="
+        
         guard let metadataKeyEncryptedData = NCEndToEndEncryption.sharedManager().encryptAsymmetricString(key, publicKey: nil, privateKey: privateKey) else {
         guard let metadataKeyEncryptedData = NCEndToEndEncryption.sharedManager().encryptAsymmetricString(key, publicKey: nil, privateKey: privateKey) else {
             return nil
             return nil
         }
         }
@@ -121,6 +123,8 @@ class NCEndToEndMetadata : NSObject  {
             let jsonString = String(data: jsonData, encoding: .utf8)
             let jsonString = String(data: jsonData, encoding: .utf8)
             print("JSON String : " + jsonString!)
             print("JSON String : " + jsonString!)
             
             
+            _ = decoderMetadata(jsonString!, privateKey: privateKey, serverUrl: "", account: "", url: "")
+            
             return jsonString
             return jsonString
             
             
         } catch let error {
         } catch let error {