浏览代码

clear code

Marino Faggiana 7 年之前
父节点
当前提交
ced7e8d55d
共有 2 个文件被更改,包括 3 次插入53 次删除
  1. 0 2
      iOSClient/Favorites/CCFavorites.m
  2. 3 51
      iOSClient/Main/CCMain.m

+ 0 - 2
iOSClient/Favorites/CCFavorites.m

@@ -459,8 +459,6 @@
     if (_metadata.cryptated == NO) {
         
         [actionSheet addButtonWithTitle:NSLocalizedString(@"_share_", nil) image:[CCGraphics changeThemingColorImage:[UIImage imageNamed:@"actionSheetShare"] color:[NCBrandColor sharedInstance].brand] backgroundColor:[UIColor whiteColor] height: 50.0 type:AHKActionSheetButtonTypeDefault handler:^(AHKActionSheet *as) {
-                // close swipe
-                [self setEditing:NO animated:YES];
                                     
                 [app.activeMain openWindowShare:metadata];
             }];

+ 3 - 51
iOSClient/Main/CCMain.m

@@ -4266,10 +4266,7 @@
                                      height: 50.0
                                        type:AHKActionSheetButtonTypeDefault
                                     handler:^(AHKActionSheet *as) {
-                                        
-                                        // close swipe
-                                        [self setEditing:NO animated:YES];
-                                        
+         
                                         if (_metadata.favorite)
                                             [self removeFavorite:_metadata];
                                         else
@@ -4287,9 +4284,6 @@
                                        type:AHKActionSheetButtonTypeDefault
                                     handler:^(AHKActionSheet *as) {
                                         
-                                        // close swipe
-                                        [self setEditing:NO animated:YES];
-                                        
                                         [self openWindowShare:_metadata];
                                     }];
         }
@@ -4303,9 +4297,6 @@
                                        type:AHKActionSheetButtonTypeDefault
                                     handler:^(AHKActionSheet *as) {
                                         
-                                        // close swipe
-                                        [self setEditing:NO animated:YES];
-                                        
                                         UIAlertController *alertController = [UIAlertController alertControllerWithTitle:NSLocalizedString(@"_rename_",nil) message:nil preferredStyle:UIAlertControllerStyleAlert];
                                         
                                         [alertController addTextFieldWithConfigurationHandler:^(UITextField *textField) {
@@ -4344,9 +4335,6 @@
                                        type:AHKActionSheetButtonTypeDefault
                                     handler:^(AHKActionSheet *as) {
                                         
-                                        // close swipe
-                                        [self setEditing:NO animated:YES];
-                                        
                                         [self moveOpenWindow:[[NSArray alloc] initWithObjects:indexPath, nil]];
                                     }];
         }
@@ -4360,9 +4348,6 @@
                                        type:AHKActionSheetButtonTypeDefault
                                     handler:^(AHKActionSheet *as) {
                                         
-                                        // close swipe
-                                        [self setEditing:NO animated:YES];
-                                        
                                         // Settings new folder Automatatic upload
                                         NSString *oldAutoUploadDirectory = [[NCManageDatabase sharedInstance] getAccountAutoUploadDirectory:app.activeUrl];
                                         
@@ -4392,9 +4377,6 @@
                                        type:AHKActionSheetButtonTypeEncrypted
                                     handler:^(AHKActionSheet *as) {
                                         
-                                        // close swipe
-                                        [self setEditing:NO animated:YES];
-                                        
                                         [self performSelector:@selector(comandoLockPassword) withObject:nil];
                                     }];
         }
@@ -4408,9 +4390,6 @@
                                        type:AHKActionSheetButtonTypeEncrypted
                                     handler:^(AHKActionSheet *as) {
                                         
-                                        // close swipe
-                                        [self setEditing:NO animated:YES];
-                                        
                                         [self performSelector:@selector(encyptedDecryptedFolder) withObject:nil];
                                     }];
         }
@@ -4447,10 +4426,7 @@
                                      height: 50.0
                                        type:AHKActionSheetButtonTypeDefault
                                     handler:^(AHKActionSheet *as) {
-                                        
-                                        // close swipe
-                                        [self setEditing:NO animated:YES];
-                                        
+         
                                         if (_metadata.favorite)
                                             [self  removeFavorite:_metadata];
                                         else
@@ -4468,9 +4444,6 @@
                                        type:AHKActionSheetButtonTypeDefault
                                     handler:^(AHKActionSheet *as) {
                                         
-                                        // close swipe
-                                        [self setEditing:NO animated:YES];
-                                        
                                         [self openWindowShare:_metadata];
                                     }];
         }
@@ -4482,9 +4455,6 @@
                                    type:AHKActionSheetButtonTypeDefault
                                 handler:^(AHKActionSheet *as) {
                                     
-                                    // close swipe
-                                    [self setEditing:NO animated:YES];
-                                    
                                     [self performSelector:@selector(openIn:) withObject:_metadata];
                                 }];
         
@@ -4495,9 +4465,6 @@
                                    type:AHKActionSheetButtonTypeDefault
                                 handler:^(AHKActionSheet *as) {
                                     
-                                    // close swipe
-                                    [self setEditing:NO animated:YES];
-                                    
                                     UIAlertController *alertController = [UIAlertController alertControllerWithTitle:NSLocalizedString(@"_rename_",nil) message:nil preferredStyle:UIAlertControllerStyleAlert];
                                     
                                     [alertController addTextFieldWithConfigurationHandler:^(UITextField *textField) {
@@ -4532,9 +4499,6 @@
                                    type:AHKActionSheetButtonTypeDefault
                                 handler:^(AHKActionSheet *as) {
                                     
-                                    // close swipe
-                                    [self setEditing:NO animated:YES];
-                                    
                                     [self moveOpenWindow:[[NSArray alloc] initWithObjects:indexPath, nil]];
                                 }];
         
@@ -4547,9 +4511,6 @@
                                        type:AHKActionSheetButtonTypeDefault
                                     handler:^(AHKActionSheet *as) {
                                         
-                                        // close swipe
-                                        [self setEditing:NO animated:YES];
-                                        
                                         [self performSelector:@selector(removeLocalFile:) withObject:_metadata];
                                     }];
         }
@@ -4563,9 +4524,6 @@
                                        type:AHKActionSheetButtonTypeEncrypted
                                     handler:^(AHKActionSheet *as) {
                                         
-                                        // close swipe
-                                        [self setEditing:NO animated:YES];
-                                        
                                         [self performSelector:@selector(cmdEncryptedDecryptedFile) withObject:nil];
                                     }];
         }
@@ -4610,9 +4568,6 @@
                                        type:AHKActionSheetButtonTypeDefault
                                     handler:^(AHKActionSheet *as) {
                                         
-                                        // close swipe
-                                        [self setEditing:NO animated:YES];
-                                        
                                         UIAlertController *alertController = [UIAlertController alertControllerWithTitle:NSLocalizedString(@"_rename_",nil) message:nil preferredStyle:UIAlertControllerStyleAlert];
                                         
                                         [alertController addTextFieldWithConfigurationHandler:^(UITextField *textField) {
@@ -4646,10 +4601,7 @@
                                  height: 50.0
                                    type:AHKActionSheetButtonTypeDefault
                                 handler:^(AHKActionSheet *as) {
-                                    
-                                    // close swipe
-                                    [self setEditing:NO animated:YES];
-                                    
+                                                                        
                                     [self moveOpenWindow:[[NSArray alloc] initWithObjects:indexPath, nil]];
                                 }];