浏览代码

Improved endToEndInitialize

Marino Faggiana 7 年之前
父节点
当前提交
c95c7b6350
共有 2 个文件被更改,包括 2 次插入3 次删除
  1. 0 2
      iOSClient/Settings/CCSettings.m
  2. 2 1
      iOSClient/Settings/NCManageEndToEndEncryption.m

+ 0 - 2
iOSClient/Settings/CCSettings.m

@@ -115,7 +115,6 @@
     [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textLabel.font"];
     [section addFormRow:row];
     
-    /*
     // Section : E2EEncryption --------------------------------------------------------------
 
     section = [XLFormSectionDescriptor formSectionWithTitle:NSLocalizedString(@"_e2e_settings_title_", nil)];
@@ -128,7 +127,6 @@
     [row.cellConfig setObject:[UIImage imageNamed:@"settingsE2EEncryption"] forKey:@"imageView.image"];
     row.action.viewControllerClass = [NCManageEndToEndEncryption class];
     [section addFormRow:row];
-    */
     
     // Section Advanced -------------------------------------------------
     

+ 2 - 1
iOSClient/Settings/NCManageEndToEndEncryption.m

@@ -182,6 +182,7 @@
     
     // E2E
     self.endToEndInitialize = [NCEndToEndInitialize new];
+    self.endToEndInitialize.delegate = self;
 }
 
 #pragma --------------------------------------------------------------------------------------------
@@ -395,7 +396,7 @@
     
     if (aViewController.fromType == CCBKPasscodeFromStartEncryption) {
         
-        //[appDelegate.endToEndInterface initEndToEndEncryption];
+        [self.endToEndInitialize initEndToEndEncryption];        
     }
     
     if (aViewController.fromType == CCBKPasscodeFromCheckPassphrase) {