clear code

Picker/DocumentPickerViewController.swift

@@ -711,7 +711,7 @@ extension DocumentPickerViewController: UITableViewDataSource {
             
         } else {
             
-            // e2e DENIED
+            // E2EE DENIED
             if (metadata?.e2eEncrypted == true) {
                 return
             }

Share/ShareViewController.m

@@ -203,7 +203,7 @@
     viewController.barTintColor = barTintColor;
     viewController.tintColorTitle = tintColor;
     viewController.networkingOperationQueue = _networkingOperationQueue;
-    // E2E
+    // E2EE
     viewController.includeDirectoryE2EEncryption = NO;
 
     [navigationController setModalPresentationStyle:UIModalPresentationFormSheet];

iOSClient/Actions/CCActions.swift

@@ -102,7 +102,7 @@ class CCActions: NSObject {
         
         DispatchQueue.global().async {
         
-            // E2E LOCK
+            // E2EE LOCK
             let tableE2eEncryption = NCManageDatabase.sharedInstance.getE2eEncryption(predicate: NSPredicate(format: "account = %@ AND fileNameIdentifier = %@", self.appDelegate.activeAccount, metadata.fileName))
             if tableE2eEncryption != nil {
                 let error = NCNetworkingSync.sharedManager().lockEnd(toEndFolderEncrypted: self.appDelegate.activeUser, userID: self.appDelegate.activeUserID, password: self.appDelegate.activePassword, url: self.appDelegate.activeUrl, fileID: tableDirectory.fileID, token: &token)
@@ -147,7 +147,7 @@ class CCActions: NSObject {
             return
         }
         
-        // E2E Rebuild and send Metadata
+        // E2EE Rebuild and send Metadata
         if tableDirectory.e2eEncrypted {
             
             DispatchQueue.global().async {
@@ -465,7 +465,7 @@ class CCActions: NSObject {
         
         NCManageDatabase.sharedInstance.deleteLocalFile(predicate: NSPredicate(format: "fileID == %@", metadata.fileID))
         NCManageDatabase.sharedInstance.deleteMetadata(predicate: NSPredicate(format: "fileID == %@", metadata.fileID), clearDateReadDirectoryID: nil)
-        // E2E (if exists the record)
+        // E2EE (if exists the record)
         NCManageDatabase.sharedInstance.deleteE2eEncryption(predicate: NSPredicate(format: "account = %@ AND serverUrl = %@ AND fileNameIdentifier = %@", metadata.account, serverUrl, metadata.fileName))
     }
 }

iOSClient/AppDelegate.m

@@ -1407,7 +1407,7 @@
     // BACKGROND & FOREGROUND
     if ([[UIApplication sharedApplication] applicationState] == UIApplicationStateBackground) {
         
-        // E2E
+        // E2EE
         NSString *serverUrlAutoUpload = [[NCManageDatabase sharedInstance] getAccountAutoUploadPath:self.activeUrl];
         tableDirectory *directory = [[NCManageDatabase sharedInstance] getTableDirectoryWithPredicate:[NSPredicate predicateWithFormat:@"account = %@ AND serverUrl = %@ AND e2eEncrypted = 1", self.activeAccount, serverUrlAutoUpload]];
         

iOSClient/CCGlobal.h

@@ -265,7 +265,7 @@ extern NSString *const flowEndpoint;
 #define k_activityDebugActionCapabilities               @"Capabilities Of Server"
 #define k_activityDebugActionEndToEndEncryption         @"End To End Encryption "
 
-// E2E
+// E2EE
 #define k_max_filesize_E2E                              524288000   // 500 MB
 
 // -----------------------------------------------------------------------------------------------------------

iOSClient/Create/CCCreateCloud.swift

@@ -439,7 +439,7 @@ class CreateFormUploadAssets: XLFormViewController, CCMoveDelegate {
         viewController.tintColorTitle = NCBrandColor.sharedInstance.brandText
         viewController.move.title = NSLocalizedString("_select_", comment: "");
         viewController.networkingOperationQueue =  appDelegate.netQueue
-        // E2E
+        // E2EE
         viewController.includeDirectoryE2EEncryption = true;
         
         navigationController.modalPresentationStyle = UIModalPresentationStyle.formSheet
@@ -659,7 +659,7 @@ class CreateFormUploadFile: XLFormViewController, CCMoveDelegate {
         viewController.tintColorTitle = NCBrandColor.sharedInstance.brandText
         viewController.move.title = NSLocalizedString("_select_", comment: "");
         viewController.networkingOperationQueue =  appDelegate.netQueue
-        // E2E
+        // E2EE
         viewController.includeDirectoryE2EEncryption = true;
         
         navigationController.modalPresentationStyle = UIModalPresentationStyle.formSheet

iOSClient/Favorites/CCFavorites.m

@@ -607,7 +607,7 @@
         }
         
         // ----------------------------------------------------------------------------------------------------------
-        // E2E Image Status Encrypted
+        // E2EE Image Status Encrypted
         // ----------------------------------------------------------------------------------------------------------
         
         tableE2eEncryption *tableE2eEncryption = [[NCManageDatabase sharedInstance] getE2eEncryptionWithPredicate:[NSPredicate predicateWithFormat:@"account = %@ AND fileNameIdentifier = %@", appDelegate.activeAccount, metadata.fileName]];

iOSClient/Library/OCCommunicationLib/OCWebDavClient/OCWebDAVClient.h

@@ -67,9 +67,9 @@ extern NSString * _Nullable OCWebDAVModificationDateKey;
 @property (nonatomic, strong) NSString * _Nullable originalUrlServer;
 
 @property (nonatomic, strong) NSString * _Nullable postStringForShare;
-// E2E Metadata 
+// E2EE Metadata
 @property (nonatomic, strong) NSString * _Nullable postStringMetadata;
-// E2E privateKey, publicKey
+// E2EE privateKey, publicKey
 @property (nonatomic, strong) NSString * _Nullable postStringKey;
 
 /**

iOSClient/Main/CCDetail.m

@@ -202,12 +202,12 @@
     _buttonDelete = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemTrash target:self action:@selector(deleteButtonPressed:)];
     
     if ([_fileNameExtension isEqualToString:@"TXT"]) {
-        if ([CCUtility isFolderEncrypted:[[NCManageDatabase sharedInstance] getServerUrl:_metadataDetail.directoryID] account:appDelegate.activeAccount]) // E2E
+        if ([CCUtility isFolderEncrypted:[[NCManageDatabase sharedInstance] getServerUrl:_metadataDetail.directoryID] account:appDelegate.activeAccount]) // E2EE
             [_toolbar setItems:[NSArray arrayWithObjects: _buttonModifyTxt, flexible, _buttonDelete, fixedSpaceMini, _buttonAction,  nil]];
         else
             [_toolbar setItems:[NSArray arrayWithObjects: _buttonModifyTxt, flexible, _buttonDelete, fixedSpaceMini, _buttonShare, fixedSpaceMini, _buttonAction,  nil]];
     } else {
-        if ([CCUtility isFolderEncrypted:[[NCManageDatabase sharedInstance] getServerUrl:_metadataDetail.directoryID] account:appDelegate.activeAccount]) // E2E
+        if ([CCUtility isFolderEncrypted:[[NCManageDatabase sharedInstance] getServerUrl:_metadataDetail.directoryID] account:appDelegate.activeAccount]) // E2EE
             [_toolbar setItems:[NSArray arrayWithObjects: flexible, _buttonDelete, fixedSpaceMini, _buttonAction,  nil]];
         else
             [_toolbar setItems:[NSArray arrayWithObjects: flexible, _buttonDelete, fixedSpaceMini, _buttonShare, fixedSpaceMini, _buttonAction,  nil]];
@@ -375,7 +375,7 @@
     // PhotoBrowser
     self.photoBrowser.displayActionButton = YES;
     self.photoBrowser.displayDeleteButton = YES;
-    if ([CCUtility isFolderEncrypted:[[NCManageDatabase sharedInstance] getServerUrl:_metadataDetail.directoryID] account:appDelegate.activeAccount]) // E2E
+    if ([CCUtility isFolderEncrypted:[[NCManageDatabase sharedInstance] getServerUrl:_metadataDetail.directoryID] account:appDelegate.activeAccount]) // E2EE
         self.photoBrowser.displayShareButton = NO;
     else
         self.photoBrowser.displayShareButton = YES;

iOSClient/Main/CCMain.m

@@ -1665,7 +1665,7 @@
         
         tableDirectory *directory = [[NCManageDatabase sharedInstance] getTableDirectoryWithPredicate:[NSPredicate predicateWithFormat:@"account = %@ AND serverUrl = %@", metadataNet.account, metadataNet.serverUrl]];
         
-        // Change etag or // E2E encrypted folder
+        // Change etag or // E2EE encrypted folder
         if ([metadata.etag isEqualToString:directory.etag] == NO || (_metadataFolder.e2eEncrypted && [CCUtility isEndToEndEnabled:appDelegate.activeAccount])) {
             [self readFolder:metadataNet.serverUrl];
         }
@@ -1799,7 +1799,7 @@
         [self tableViewReloadData];
     }
     
-    // E2E Is encrypted folder get metadata
+    // E2EE Is encrypted folder get metadata
     if (_metadataFolder.e2eEncrypted) {
         
         // Read Metadata
@@ -2053,7 +2053,7 @@
 {
     [_queueSelector addObject:selectorDelete];
     
-    // E2E LOCK
+    // E2EE LOCK
     tableE2eEncryption *tableE2eEncryption = [[NCManageDatabase sharedInstance] getE2eEncryptionWithPredicate:[NSPredicate predicateWithFormat:@"account = %@ AND fileNameIdentifier = %@", appDelegate.activeAccount, metadata.fileName]];
     if (tableE2eEncryption) {
         
@@ -2096,7 +2096,7 @@
     tableMetadata* metadata = [arguments objectAtIndex:0];
     NSString *fileName = [arguments objectAtIndex:1];
     
-    // E2E
+    // E2EE
     if ([CCUtility isFolderEncrypted:self.serverUrl account:appDelegate.activeAccount]) {
         
         // verify if exists the new fileName
@@ -2290,7 +2290,7 @@
 {
     [_queueSelector removeAllObjects];
     
-    // E2E DENIED
+    // E2EE DENIED
     if ([CCUtility isFolderEncrypted:serverUrlTo account:appDelegate.activeAccount]) {
         
         [appDelegate messageNotification:@"_move_" description:@"Not possible move files to encrypted directory" visible:YES delay:k_dismissAfterSecond type:TWMessageBarMessageTypeInfo errorCode:0];
@@ -2326,7 +2326,7 @@
     viewController.barTintColor = [NCBrandColor sharedInstance].brand;
     viewController.tintColorTitle = [NCBrandColor sharedInstance].brandText;
     viewController.networkingOperationQueue = appDelegate.netQueue;
-    // E2E
+    // E2EE
     viewController.includeDirectoryE2EEncryption = NO;
     
     [navigationController setModalPresentationStyle:UIModalPresentationFormSheet];
@@ -3901,7 +3901,7 @@
     if (metadata == nil || metadata.sessionTaskIdentifier != k_taskIdentifierDone)
         return NO;
     
-    // E2E
+    // E2EE
     if ([CCUtility isFolderEncrypted:self.serverUrl account:appDelegate.activeAccount] && [CCUtility isEndToEndEnabled:appDelegate.activeAccount] == NO)
         return NO;
     
@@ -4848,7 +4848,7 @@
         cell.status.image = [UIImage imageNamed:@"passcode"];
     
     // ----------------------------------------------------------------------------------------------------------
-    // E2E Image Status Encrypted
+    // E2EE Image Status Encrypted
     // ----------------------------------------------------------------------------------------------------------
     
     if (_metadataFolder.e2eEncrypted && !metadata.directory) {

iOSClient/Networking/CCNetworking.m

@@ -697,7 +697,7 @@
         if ([metadata.typeFile isEqualToString: k_metadataTypeFile_image])
             [[CCExifGeo sharedInstance] setExifLocalTableEtag:metadata directoryUser:_directoryUser activeAccount:_activeAccount];
 
-        // E2E Decrypted
+        // E2EE Decrypted
         tableE2eEncryption *object = [[NCManageDatabase sharedInstance] getE2eEncryptionWithPredicate:[NSPredicate predicateWithFormat:@"fileNameIdentifier = %@ AND serverUrl = %@", fileName, serverUrl]];
         if (object) {
             BOOL result = [[NCEndToEndEncryption sharedManager] decryptFileID:fileID directoryUser:_directoryUser key:object.key initializationVector:object.initializationVector authenticationTag:object.authenticationTag];
@@ -852,7 +852,7 @@
     metadata.sessionSelector = selector;
     metadata.sessionSelectorPost = selectorPost;
     
-    // E2E *** IS ENCRYPTED ---> ENCRYPTED FILE ***
+    // E2EE *** IS ENCRYPTED ---> ENCRYPTED FILE ***
     if ([CCUtility isFolderEncrypted:serverUrl account:_activeAccount] && [CCUtility isEndToEndEnabled:_activeAccount]) {
         
         dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
@@ -979,7 +979,7 @@
         
     } else {
         
-        // E2E *** IS ENCRYPTED ---> CREATE SEND METADATA ***
+        // E2EE *** IS ENCRYPTED ---> CREATE SEND METADATA ***
         if ([CCUtility isFolderEncrypted:serverUrl account:_activeAccount] && [CCUtility isEndToEndEnabled:_activeAccount]) {
             
             dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_HIGH, 0), ^{
@@ -1177,7 +1177,7 @@
         [[NCManageDatabase sharedInstance] addActivityClient:metadata.fileNameView fileID:fileID action:k_activityDebugActionUpload selector:metadata.sessionSelector note:serverUrl type:k_activityTypeSuccess verbose:k_activityVerboseDefault activeUrl:_activeUrl];
     }
     
-    // E2E *** IS ENCRYPTED ---> UNLOCK ***
+    // E2EE *** IS ENCRYPTED ---> UNLOCK ***
     if ([CCUtility isFolderEncrypted:serverUrl account:_activeAccount] && [CCUtility isEndToEndEnabled:_activeAccount]) {
         
         // OK remove record on tableQueueUpload [NEXT UPLOAD]
@@ -1464,9 +1464,9 @@
 }
 
 #pragma --------------------------------------------------------------------------------------------
-#pragma mark =====  End To End Encryption =====
+#pragma mark ===== E2EE End To End Encryption =====
 #pragma --------------------------------------------------------------------------------------------
-// E2E
+// E2EE
 
 - (void)encryptedE2EFile:(NSString *)fileName serverUrl:(NSString *)serverUrl directoryID:(NSString *)directoryID account:(NSString *)account user:(NSString *)user userID:(NSString *)userID password:(NSString *)password url:(NSString *)url errorMessage:(NSString * __autoreleasing *)errorMessage fileNameIdentifier:(NSString **)fileNameIdentifier e2eMetadata:(NSString * __autoreleasing *)e2eMetadata
 {

iOSClient/Networking/NCNetworkingSync.m

@@ -191,9 +191,9 @@
     return returnError;
 }
 #pragma --------------------------------------------------------------------------------------------
-#pragma mark ===== End-to-End Encryption =====
+#pragma mark ===== E2EE End-to-End Encryption =====
 #pragma --------------------------------------------------------------------------------------------
-// E2E
+// E2EE
 
 - (NSError *)markEndToEndFolderEncrypted:(NSString *)user userID:(NSString *)userID password:(NSString *)password url:(NSString *)url fileID:(NSString *)fileID serverUrl:(NSString *)serverUrl token:(NSString  **)token
 {

iOSClient/QuickActions/CCQuickActions.m

@@ -167,7 +167,7 @@
     _move.barTintColor = [NCBrandColor sharedInstance].brand;
     _move.tintColorTitle = [NCBrandColor sharedInstance].brandText;
     _move.networkingOperationQueue = appDelegate.netQueue;
-    // E2E
+    // E2EE
     _move.includeDirectoryE2EEncryption = NO;
     
     [navigationController setModalPresentationStyle:UIModalPresentationFormSheet];

iOSClient/Settings/NCManageEndToEndEncryption.m

@@ -180,7 +180,7 @@
 {
     [super viewDidLoad];
     
-    // E2E
+    // E2EE
     self.endToEndInitialize = [NCEndToEndInitialize new];
     self.endToEndInitialize.delegate = self;
 }

iOSClient/UploadFromOtherUpp/CCUploadFromOtherUpp.m

@@ -165,7 +165,7 @@
     viewController.barTintColor = [NCBrandColor sharedInstance].brand;
     viewController.tintColorTitle = [NCBrandColor sharedInstance].brandText;
     viewController.networkingOperationQueue = appDelegate.netQueue;
-    // E2E
+    // E2EE
     viewController.includeDirectoryE2EEncryption = NO;
     
     [self presentViewController:navigationController animated:YES completion:nil];

iOSClient/Utility/CCUtility.m

@@ -949,7 +949,7 @@
     fileName = [CCUtility removeForbiddenCharactersServer:fileName];
     fileNameView = fileName;
     
-    // E2E find the fileName for fileNameView
+    // E2EE find the fileName for fileNameView
     if (isFolderEncrypted) {
         tableE2eEncryption *tableE2eEncryption = [[NCManageDatabase sharedInstance] getE2eEncryptionWithPredicate:[NSPredicate predicateWithFormat:@"account = %@ AND serverUrl = %@ AND fileNameIdentifier = %@", activeAccount, serverUrl, fileName]];
         if (tableE2eEncryption)