Ver código fonte

fix encoderMetadata

Marino Faggiana 7 anos atrás
pai
commit
bce966bc62

+ 1 - 1
iOSClient/Networking/CCNetworking.m

@@ -1119,7 +1119,7 @@
             
             NSArray *tableE2eEncryption = [[NCManageDatabase sharedInstance] getE2eEncryptionsWithPredicate:[NSPredicate predicateWithFormat:@"account = %@ AND serverUrl = %@", _activeAccount, serverUrl]];
             
-            e2eMetadataJSON = [[NCEndToEndMetadata sharedInstance] encoderMetadata:tableE2eEncryption publicKey:[CCUtility getEndToEndPublicKey:_activeAccount] privateKey:[CCUtility getEndToEndPrivateKey:_activeAccount]];
+            e2eMetadataJSON = [[NCEndToEndMetadata sharedInstance] encoderMetadata:tableE2eEncryption privateKey:[CCUtility getEndToEndPrivateKey:_activeAccount]];
             
             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];

+ 2 - 2
iOSClient/Security/NCEndToEndMetadata.swift

@@ -68,7 +68,7 @@ class NCEndToEndMetadata : NSObject  {
     // MARK: Encode / Decode JSON Metadata
     // --------------------------------------------------------------------------------------------
     
-    @objc func encoderMetadata(_ recordsE2eEncryption: [tableE2eEncryption], publicKey: String, privateKey: String) -> String? {
+    @objc func encoderMetadata(_ recordsE2eEncryption: [tableE2eEncryption], privateKey: String) -> String? {
         
         let jsonEncoder = JSONEncoder.init()
         var files = [String: e2eMetadata.filesCodable]()
@@ -109,7 +109,7 @@ class NCEndToEndMetadata : NSObject  {
             version = recordE2eEncryption.version
         }
         
-        // Create "metadataKey" with encrypted publicKey
+        // Create "metadataKey" with encrypted maetadatakey
         let e2eMetadataKey = e2eMetadata.metadataKeyCodable(metadataKeys: ["0":metadataKeyBase64], version: version)
         
         // Create final Json e2emetadata