Browse Source

change name función e2e

Marino Faggiana 7 years ago
parent
commit
ed7882a067

+ 1 - 1
iOSClient/Main/CCMain.m

@@ -2013,7 +2013,7 @@
             // E2E
             if (_metadataFolder.e2eEncrypted)
                 dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
-                    [[CCNetworking sharedNetworking] rebuildEndToEndMetadataOnServerUrl:self.serverUrl];
+                    [[CCNetworking sharedNetworking] rebuildAndSendEndToEndMetadataOnServerUrl:self.serverUrl];
                 });
             
             // End Select Table View

+ 1 - 1
iOSClient/Networking/CCNetworking.h

@@ -72,7 +72,7 @@
 
 // E2E Encryption
 - (NSError *)SendEndToEndMetadataOnServerUrl:(NSString *)serverUrl;
-- (BOOL)rebuildEndToEndMetadataOnServerUrl:(NSString *)serverUrl;
+- (NSError *)rebuildAndSendEndToEndMetadataOnServerUrl:(NSString *)serverUrl;
 
 @end
 

+ 4 - 6
iOSClient/Networking/CCNetworking.m

@@ -1525,7 +1525,7 @@
     return error;
 }
 
-- (BOOL)rebuildEndToEndMetadataOnServerUrl:(NSString *)serverUrl
+- (NSError *)rebuildAndSendEndToEndMetadataOnServerUrl:(NSString *)serverUrl
 {
     NSString *e2eTokenLock;
     NSError *error;
@@ -1535,17 +1535,15 @@
 
     NSArray *tableE2eEncryption = [[NCManageDatabase sharedInstance] getE2eEncryptionsWithPredicate:[NSPredicate predicateWithFormat:@"account = %@ AND serverUrl = %@", _activeAccount, serverUrl]];
     if (tableE2eEncryption) {
-    
+
         e2eMetadataJSON = [[NCEndToEndMetadata sharedInstance] encoderMetadata:tableE2eEncryption privateKey:[CCUtility getEndToEndPrivateKey:_activeAccount] serverUrl:serverUrl];
         if (!e2eMetadataJSON)
-            return false;
+            return [NSError errorWithDomain:@"com.nextcloud.nextcloud" code:k_CCErrorInternalError userInfo:[NSDictionary dictionaryWithObject:@"Serious internal error in encoding metadata" forKey:NSLocalizedDescriptionKey]];
     }
     
     error = [[NCNetworkingSync sharedManager] rebuildEndToEndMetadata:_activeUser userID:_activeUserID password:_activePassword url:_activeUrl fileID:directory.fileID metadata:e2eMetadataJSON token:&e2eTokenLock];
-    if (error)
-        return false;
     
-    return true;
+    return error;
 }
 
 @end