Browse Source

clear code json metadata

Marino Faggiana 7 years ago
parent
commit
139f1f5351

+ 1 - 1
iOSClient/Networking/CCNetworking.m

@@ -1119,7 +1119,7 @@
             
             
             NSArray *tableE2eEncryption = [[NCManageDatabase sharedInstance] getE2eEncryptionsWithPredicate:[NSPredicate predicateWithFormat:@"account = %@ AND serverUrl = %@", _activeAccount, serverUrl]];
             NSArray *tableE2eEncryption = [[NCManageDatabase sharedInstance] getE2eEncryptionsWithPredicate:[NSPredicate predicateWithFormat:@"account = %@ AND serverUrl = %@", _activeAccount, serverUrl]];
             
             
-            e2eMetadataJSON = [[NCEndToEndMetadata sharedInstance] encoderMetadata:tableE2eEncryption publicKey:[CCUtility getEndToEndPublicKey:_activeAccount]];
+            e2eMetadataJSON = [[NCEndToEndMetadata sharedInstance] encoderMetadata:tableE2eEncryption publicKey:[CCUtility getEndToEndPublicKey:_activeAccount] privateKey:[CCUtility getEndToEndPrivateKey:_activeAccount]];
             
             
             if (!e2eMetadataJSON) {
             if (!e2eMetadataJSON) {
                 [[NCManageDatabase sharedInstance] addActivityClient:fileName fileID:assetLocalIdentifier action:k_activityDebugActionUpload selector:selector note:@"Serious internal error to encoding metadata" type:k_activityTypeFailure verbose:k_activityVerboseHigh activeUrl:_activeUrl];
                 [[NCManageDatabase sharedInstance] addActivityClient:fileName fileID:assetLocalIdentifier action:k_activityDebugActionUpload selector:selector note:@"Serious internal error to encoding metadata" type:k_activityTypeFailure verbose:k_activityVerboseHigh activeUrl:_activeUrl];

+ 5 - 2
iOSClient/Security/NCEndToEndMetadata.swift

@@ -51,7 +51,7 @@ class NCEndToEndMetadata : NSObject  {
             let initializationVector: String
             let initializationVector: String
             let authenticationTag: String
             let authenticationTag: String
             let metadataKey: Int
             let metadataKey: Int
-            let encrypted: String // encryptedFile
+            let encrypted: String // encryptedFileAttributes
         }
         }
         
         
         let files: [String: filesCodable]
         let files: [String: filesCodable]
@@ -68,12 +68,15 @@ class NCEndToEndMetadata : NSObject  {
     // MARK: Encode / Decode JSON Metadata
     // MARK: Encode / Decode JSON Metadata
     // --------------------------------------------------------------------------------------------
     // --------------------------------------------------------------------------------------------
     
     
-    @objc func encoderMetadata(_ recordsE2eEncryption: [tableE2eEncryption], publicKey: String) -> String? {
+    @objc func encoderMetadata(_ recordsE2eEncryption: [tableE2eEncryption], publicKey: String, privateKey: String) -> String? {
         
         
         let jsonEncoder = JSONEncoder.init()
         let jsonEncoder = JSONEncoder.init()
         var files = [String: e2eMetadata.filesCodable]()
         var files = [String: e2eMetadata.filesCodable]()
         var version = 1
         var version = 1
         
         
+        // Create publicKey encrypted
+        //NCEndToEndEncryption.sharedManager().encryptAsymmetricString(<#T##plain: String!##String!#>, publicKey: <#T##String!#>)
+        
         // Create "files"
         // Create "files"
         for recordE2eEncryption in recordsE2eEncryption {
         for recordE2eEncryption in recordsE2eEncryption {