clear code

iOSClient/Security/NCEntoToEndInterface.swift

@@ -122,7 +122,7 @@ class NCEntoToEndInterface : NSObject, OCNetworkingDelegate  {
         if (storePrivateKey) {
             signPublicKey = false
             storePrivateKey = false
-            alertController("_success_", message: "_e2e_settings_encryption_activated_")
+            alertController("_success_", message: "_e2e_settings_activated_")
         }
     }
 
@@ -239,7 +239,7 @@ class NCEntoToEndInterface : NSObject, OCNetworkingDelegate  {
         if (signPublicKey) {
             signPublicKey = false
             storePrivateKey = false
-            alertController("_success_", message: "_e2e_settings_encryption_activated_")
+            alertController("_success_", message: "_e2e_settings_activated_")
         }
     }
     

iOSClient/Settings/CCSettings.m

@@ -110,11 +110,11 @@
     
     // Section : E2EEncryption --------------------------------------------------------------
 
-    section = [XLFormSectionDescriptor formSectionWithTitle:NSLocalizedString(@"_e2e_settings_encryption_title_", nil)];
+    section = [XLFormSectionDescriptor formSectionWithTitle:NSLocalizedString(@"_e2e_settings_title_", nil)];
     [form addFormSection:section];
     
     // EndToEnd Encryption
-    row = [XLFormRowDescriptor formRowDescriptorWithTag:@"e2eEncryption" rowType:XLFormRowDescriptorTypeButton title:NSLocalizedString(@"_e2e_settings_encryption_", nil)];
+    row = [XLFormRowDescriptor formRowDescriptorWithTag:@"e2eEncryption" rowType:XLFormRowDescriptorTypeButton title:NSLocalizedString(@"_e2e_settings_", nil)];
     [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textLabel.font"];
     [row.cellConfig setObject:[UIImage imageNamed:@"settingsE2EEncryption"] forKey:@"imageView.image"];
     row.action.viewControllerClass = [NCManageEndToEndEncryption class];

iOSClient/Settings/NCManageEndToEndEncryption.m

@@ -35,13 +35,13 @@
     XLFormSectionDescriptor *section;
     XLFormRowDescriptor *row;
     
-    form = [XLFormDescriptor formDescriptorWithTitle:NSLocalizedString(@"_e2e_settings_encryption_", nil)];
+    form = [XLFormDescriptor formDescriptorWithTitle:NSLocalizedString(@"_e2e_settings_", nil)];
     
     tableCapabilities *capabilities = [[NCManageDatabase sharedInstance] getCapabilites];
 
     if (capabilities.endToEndEncryption == NO) {
         
-        section = [XLFormSectionDescriptor formSectionWithTitle:NSLocalizedString(@"_e2e_settings_encryption_not_available_", nil)];
+        section = [XLFormSectionDescriptor formSectionWithTitle:NSLocalizedString(@"_e2e_settings_not_available_", nil)];
         [form addFormSection:section];
         
         return [super initWithForm:form];
@@ -50,11 +50,24 @@
     
     // Section INITIALIZE -------------------------------------------------
 
-    section = [XLFormSectionDescriptor formSectionWithTitle:NSLocalizedString(@"_e2e_settings_encryption_initialize_", nil)];
+    section = [XLFormSectionDescriptor formSectionWithTitle:NSLocalizedString(@"_e2e_settings_initialize_", nil)];
     [form addFormSection:section];
     
     // Inizializze e2e
-    row = [XLFormRowDescriptor formRowDescriptorWithTag:@"initE2E" rowType:XLFormRowDescriptorTypeButton title:NSLocalizedString(@"_e2e_settings_encryption_initialize_", nil)];
+    row = [XLFormRowDescriptor formRowDescriptorWithTag:@"initE2E" rowType:XLFormRowDescriptorTypeButton title:NSLocalizedString(@"_e2e_settings_initialize_", nil)];
+    [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textLabel.font"];
+    [row.cellConfig setObject:[UIColor blackColor] forKey:@"textLabel.textColor"];
+    [row.cellConfig setObject:@(NSTextAlignmentLeft) forKey:@"textLabel.textAlignment"];
+    row.action.formSelector = @selector(initE2E:);
+    [section addFormRow:row];
+   
+    // Section INITIALIZE -------------------------------------------------
+    
+    section = [XLFormSectionDescriptor formSectionWithTitle:NSLocalizedString(@"_e2e_settings_initialize_", nil)];
+    [form addFormSection:section];
+    
+    // Inizializze e2e
+    row = [XLFormRowDescriptor formRowDescriptorWithTag:@"initE2E" rowType:XLFormRowDescriptorTypeButton title:NSLocalizedString(@"_e2e_settings_initialize_", nil)];
     [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textLabel.font"];
     [row.cellConfig setObject:[UIColor blackColor] forKey:@"textLabel.textColor"];
     [row.cellConfig setObject:@(NSTextAlignmentLeft) forKey:@"textLabel.textAlignment"];
@@ -119,11 +132,11 @@
     
     if ([CCUtility isEndToEndEnabled:app.activeAccount]) {
         
-        message = [NSString stringWithFormat:@"%@\n\n%@\n\n%@", NSLocalizedString(@"_e2e_settings_encryption_initialize_already_request_", nil), NSLocalizedString(@"_e2e_settings_encryption_view_passphrase_", nil), app.e2ePassphrase];
+        message = [NSString stringWithFormat:@"%@\n\n%@\n\n%@", NSLocalizedString(@"_e2e_settings_initialize_already_request_", nil), NSLocalizedString(@"_e2e_settings_view_passphrase_", nil), app.e2ePassphrase];
 
     } else {
 
-        message = [NSString stringWithFormat:@"%@\n\n%@\n\n%@", NSLocalizedString(@"_e2e_settings_encryption_initialize_request_", nil), NSLocalizedString(@"_e2e_settings_encryption_view_passphrase_", nil), app.e2ePassphrase];
+        message = [NSString stringWithFormat:@"%@\n\n%@\n\n%@", NSLocalizedString(@"_e2e_settings_initialize_request_", nil), NSLocalizedString(@"_e2e_settings_view_passphrase_", nil), app.e2ePassphrase];
     }
         
     UIAlertController *alertController = [UIAlertController alertControllerWithTitle:NSLocalizedString(@"_initialization_", nil) message:message preferredStyle:UIAlertControllerStyleAlert];

iOSClient/Supporting Files/en.lproj/Localizable.strings

@@ -576,14 +576,14 @@
 
 // EndToEnd Encryption
 
-"_e2e_settings_encryption_title_"   = "Encryption";
-"_e2e_settings_encryption_"         = "End To End Encryption";
-"_e2e_settings_encryption_initialize_"      = "Initialize End To End Encryption";
-"_e2e_settings_encryption_not_available_"   = "End To End Encryption not available";
-"_e2e_settings_encryption_initialize_already_request_"  = "Service already inizialized, you want to reinitialize it ?";
-"_e2e_settings_encryption_initialize_request_" = "Do you want to start the End To End Encryption ?";
-"_e2e_settings_encryption_activated_"   = "End To End Encryption activated";
-"_e2e_settings_encryption_view_passphrase_"   = "This 12 word phrase is like a very strong password: it provides full access to view and use your encrypted files. Please write it down and keep it somewhere safe.";
+"_e2e_settings_title_"              = "Encryption";
+"_e2e_settings_"                    = "End To End Encryption";
+"_e2e_settings_initialize_"         = "Initialize End To End Encryption";
+"_e2e_settings_not_available_"      = "End To End Encryption not available";
+"_e2e_settings_initialize_already_request_" = "Service already inizialized, you want to reinitialize it ?";
+"_e2e_settings_initialize_request_" = "Do you want to start the End To End Encryption ?";
+"_e2e_settings_activated_"          = "End To End Encryption activated";
+"_e2e_settings_view_passphrase_"    = "This 12 word phrase is like a very strong password: it provides full access to view and use your encrypted files. Please write it down and keep it somewhere safe.";