Marino Faggiana %!s(int64=7) %!d(string=hai) anos
pai
achega
1b1106aaa0

+ 1 - 1
iOSClient/Main/CCMain.m

@@ -1348,7 +1348,7 @@
             NSString *mnemonic = [[NYMnemonic generateMnemonicString:@128 language:@"english"] stringByReplacingOccurrencesOfString:@" " withString:@""];
             NSString *mnemonic = [[NYMnemonic generateMnemonicString:@128 language:@"english"] stringByReplacingOccurrencesOfString:@" " withString:@""];
             mnemonic = @"moreovertelevisionfactorytendencyindependenceinternationalintellectualimpressinterestvolunteer";
             mnemonic = @"moreovertelevisionfactorytendencyindependenceinternationalintellectualimpressinterestvolunteer";
             
             
-            NSString *privateKeyEncoded = [[NCEndToEndEncryption sharedManager] createEndToEndPrivateKey:app.activeUserID directoryUser:app.directoryUser mnemonic:mnemonic];
+            NSString *privateKeyEncoded = [[NCEndToEndEncryption sharedManager] createEndToEndPrivateKey:app.directoryUser mnemonic:mnemonic];
             
             
             if (privateKeyEncoded) {
             if (privateKeyEncoded) {
                 
                 

+ 1 - 1
iOSClient/Security/NCEndToEndEncryption.h

@@ -35,6 +35,6 @@
 - (void)decryptMetadata:(tableMetadata *)metadata activeUrl:(NSString *)activeUrl;
 - (void)decryptMetadata:(tableMetadata *)metadata activeUrl:(NSString *)activeUrl;
 
 
 - (NSString *)createEndToEndPublicKey:(NSString *)userID directoryUser:(NSString *)directoryUser;
 - (NSString *)createEndToEndPublicKey:(NSString *)userID directoryUser:(NSString *)directoryUser;
-- (NSString *)createEndToEndPrivateKey:(NSString *)userID directoryUser:(NSString *)directoryUser mnemonic:(NSString *)mnemonic;
+- (NSString *)createEndToEndPrivateKey:(NSString *)directoryUser mnemonic:(NSString *)mnemonic;
 
 
 @end
 @end

+ 1 - 1
iOSClient/Security/NCEndToEndEncryption.m

@@ -272,7 +272,7 @@ cleanup:
     return [CCUtility URLEncodeStringFromString:csr];
     return [CCUtility URLEncodeStringFromString:csr];
 }
 }
 
 
-- (NSString *)createEndToEndPrivateKey:(NSString *)userID directoryUser:(NSString *)directoryUser mnemonic:(NSString *)mnemonic
+- (NSString *)createEndToEndPrivateKey:(NSString *)directoryUser mnemonic:(NSString *)mnemonic
 {
 {
     NSMutableData *privateKeyCipherData;
     NSMutableData *privateKeyCipherData;
     NSString *privateKeyCipher;
     NSString *privateKeyCipher;