dev e2e

iOSClient/Main/CCMain.h

@@ -86,5 +86,7 @@
 - (void)clearDateReadDataSource:(NSNotification *)notification;
 - (void)cancelSearchBar;
 
+- (void)initEndToEnd;
+
 @end
 

iOSClient/Main/CCMain.m

@@ -1188,14 +1188,7 @@
         
         if (![CCUtility isEndToEndEnabled:app.activeAccount]) {
             
-            metadataNet.action = actionGetEndToEndPublicKeys;
-            [app addNetworkingOperationQueue:app.netQueue delegate:self metadataNet:metadataNet];
-        
-            metadataNet.action = actionGetEndToEndPrivateKey;
-            [app addNetworkingOperationQueue:app.netQueue delegate:self metadataNet:metadataNet];
-        
-            metadataNet.action = actionGetEndToEndServerPublicKey;
-            [app addNetworkingOperationQueue:app.netQueue delegate:self metadataNet:metadataNet];
+            [self initEndToEnd];
         }
     }
 }
@@ -1240,6 +1233,22 @@
 #pragma mark ==== End-to-End Encryption  ====
 #pragma --------------------------------------------------------------------------------------------
 
+// ++++++++++++++++++++++ INITIALIZE ++++++++++++++++++++++
+
+- (void)initEndToEnd
+{
+    CCMetadataNet *metadataNet = [[CCMetadataNet alloc] initWithAccount:app.activeAccount];
+
+    metadataNet.action = actionGetEndToEndPublicKeys;
+    [app addNetworkingOperationQueue:app.netQueue delegate:self metadataNet:metadataNet];
+    
+    metadataNet.action = actionGetEndToEndPrivateKey;
+    [app addNetworkingOperationQueue:app.netQueue delegate:self metadataNet:metadataNet];
+    
+    metadataNet.action = actionGetEndToEndServerPublicKey;
+    [app addNetworkingOperationQueue:app.netQueue delegate:self metadataNet:metadataNet];
+}
+
 // ++++++++++++++++++++++ PUBLIC KEYS (SIGN) ++++++++++++++++++++++
 
 - (void)getEndToEndPublicKeysSuccess:(CCMetadataNet *)metadataNet

iOSClient/Settings/NCManageEndToEndEncryption.m

@@ -90,6 +90,8 @@
 - (void)initE2E:(XLFormRowDescriptor *)sender
 {
     [CCUtility initEndToEnd:app.activeAccount];
+    
+    [app.activeMain initEndToEnd];
 }
 
 @end