IOS-6755 T4624736 Fixed selection Cancel button on Shared Items

(cherry picked from commit 85613bb)

Author: gmagpayo

iMEGA/Node/Shared Items/SharedItemsViewController+Additions.swift

@@ -84,8 +84,8 @@ extension SharedItemsViewController {
     }
 
     @objc func searchUnverifiedNodes(key: String) {
-        searchUnverifiedNodesArray?.removeAllObjects()
-        searchUnverifiedSharesArray?.removeAllObjects()
+        searchUnverifiedNodesArray.removeAllObjects()
+        searchUnverifiedSharesArray.removeAllObjects()
 
         var nodes: [MEGANode]?
         var shares: [MEGAShare]?
@@ -101,24 +101,24 @@ extension SharedItemsViewController {
 
         guard let nodes, let shares else { return }
         guard key.isNotEmpty else {
-            searchUnverifiedSharesArray?.addObjects(from: shares)
-            searchUnverifiedNodesArray?.addObjects(from: nodes)
+            searchUnverifiedSharesArray.addObjects(from: shares)
+            searchUnverifiedNodesArray.addObjects(from: nodes)
             return
         }
 
         nodes.indices.filter {
             nodes[$0].name?.lowercased().contains(key.lowercased()) == true
         }.forEach { index in
-            searchUnverifiedSharesArray?.add(shares[index])
-            searchUnverifiedNodesArray?.add(nodes[index])
+            searchUnverifiedSharesArray.add(shares[index])
+            searchUnverifiedNodesArray.add(nodes[index])
         }
     }
 
     @objc func shareAtIndexPath(_ indexPath: IndexPath) -> MEGAShare? {
         guard indexPath.section == 0, linksButton?.isSelected == false else { return nil }
 
         if searchController.isActive {
-            return searchUnverifiedSharesArray?[indexPath.row] as? MEGAShare
+            return searchUnverifiedSharesArray[indexPath.row] as? MEGAShare
         }
 
         if outgoingButton?.isSelected == true {
@@ -149,6 +149,41 @@ extension SharedItemsViewController {
         return 1
     }
 
+    @objc func configNavigationBarButtonItems() {
+        let isEditing = tableView?.isEditing ?? false
+        guard MEGAReachabilityManager.isReachableHUDIfNot() else {
+            setNavigationBarButtonItemsEnabled(isEditing)
+            return
+        }
+        
+        guard !searchController.isActive else {
+            var isEnabled = searchNodesArray.count > 0
+            
+            if incomingButton?.isSelected == true ||
+                outgoingButton?.isSelected == true {
+                isEnabled = isEnabled || searchUnverifiedNodesArray.count > 0
+            }
+            setNavigationBarButtonItemsEnabled(isEnabled || isEditing)
+            return
+        }
+        
+        var isEnabled = false
+        if incomingButton?.isSelected == true {
+            isEnabled = incomingShareList.size.intValue > 0 ||
+                        incomingUnverifiedShareList.size.intValue > 0
+        } else if outgoingButton?.isSelected == true {
+            isEnabled = outgoingShareList.size.intValue > 0
+        } else if linksButton?.isSelected == true {
+            isEnabled = publicLinksArray.isNotEmpty
+        }
+        
+        setNavigationBarButtonItemsEnabled(isEnabled || isEditing)
+    }
+    
+    @objc func setNavigationBarButtonItemsEnabled(_ isEnabled: Bool) {
+        self.editBarButtonItem?.isEnabled = isEnabled
+    }
+    
     private func shares(from shareList: MEGAShareList) -> [MEGAShare] {
         (0..<shareList.size.intValue).compactMap { index in
             let share: MEGAShare = shareList.share(at: index)

iMEGA/Node/Shared Items/SharedItemsViewController.h

@@ -29,16 +29,21 @@ NS_ASSUME_NONNULL_BEGIN
 @property (weak, nonatomic) IBOutlet UIView *outgoingLineView;
 @property (weak, nonatomic) IBOutlet UIView *linksLineView;
 
+@property (nonatomic, strong) MEGAShareList *outgoingShareList;
 @property (nonatomic, strong, nullable) MEGAShareList *outgoingUnverifiedShareList;
 @property (nonatomic, strong, nullable) NSMutableArray<MEGAShare *> *outgoingUnverifiedSharesMutableArray;
 @property (nonatomic, strong, nullable) NSMutableArray<MEGANode *> *outgoingUnverifiedNodesMutableArray;
 
-@property (nonatomic, strong, nullable) MEGAShareList *incomingUnverifiedShareList;
+@property (nonatomic, strong) MEGAShareList *incomingShareList;
+@property (nonatomic, strong) MEGAShareList *incomingUnverifiedShareList;
 @property (nonatomic, strong, nullable) NSMutableArray<MEGAShare *> *incomingUnverifiedSharesMutableArray;
 @property (nonatomic, strong, nullable) NSMutableArray<MEGANode *> *incomingUnverifiedNodesMutableArray;
 
-@property (nonatomic, strong, nullable) NSMutableArray<MEGAShare *> *searchUnverifiedSharesArray;
-@property (nonatomic, strong, nullable) NSMutableArray<MEGANode *> *searchUnverifiedNodesArray;
+@property (nonatomic) NSMutableArray *searchNodesArray;
+@property (nonatomic, strong) NSMutableArray<MEGAShare *> *searchUnverifiedSharesArray;
+@property (nonatomic, strong) NSMutableArray<MEGANode *> *searchUnverifiedNodesArray;
+
+@property (nonatomic, strong) NSArray *publicLinksArray;
 
 @property (strong, nonatomic) SharedItemsViewModel *viewModel;
 

iMEGA/Node/Shared Items/SharedItemsViewController.m

@@ -42,24 +42,16 @@ @interface SharedItemsViewController () <UITableViewDataSource, UITableViewDeleg
 @property (weak, nonatomic) IBOutlet UIBarButtonItem *removeShareBarButtonItem;
 @property (weak, nonatomic) IBOutlet UIBarButtonItem *removeLinkBarButtonItem;
 
-@property (nonatomic, strong) MEGAShareList *incomingShareList;
 @property (nonatomic, strong) NSMutableArray *incomingNodesMutableArray;
-
-@property (nonatomic, strong) MEGAShareList *outgoingShareList;
-@property (nonatomic, strong) NSMutableArray *outgoingSharesMutableArray;
 @property (nonatomic, strong) NSMutableArray *outgoingNodesMutableArray;
-
-@property (nonatomic, strong) NSArray *publicLinksArray;
-
+@property (nonatomic, strong) NSMutableArray *outgoingSharesMutableArray;
 @property (nonatomic, strong) NSMutableArray *selectedSharesMutableArray;
 
 @property (nonatomic, strong) NSMutableDictionary *incomingNodesForEmailMutableDictionary;
 @property (nonatomic, strong) NSMutableDictionary *incomingIndexPathsMutableDictionary;
 @property (nonatomic, strong) NSMutableDictionary *outgoingNodesForEmailMutableDictionary;
 @property (nonatomic, strong) NSMutableDictionary *outgoingIndexPathsMutableDictionary;
 
-@property (nonatomic) NSMutableArray *searchNodesArray;
-
 @property (nonatomic, assign) BOOL shouldRemovePlayerDelegate;
 
 @end
@@ -227,24 +219,21 @@ - (void)reloadUI {
     }
 
     [self updateNavigationBarTitle];
+    [self configNavigationBarButtonItems];
 
     [self.tableView reloadData];
 }
 
 - (void)internetConnectionChanged {
     BOOL boolValue = [MEGAReachabilityManager isReachable];
-    [self setNavigationBarButtonItemsEnabled:boolValue];
+    [self setNavigationBarButtonItemsEnabled:boolValue || self.tableView.isEditing];
     [self toolbarItemsSetEnabled:boolValue];
 
     boolValue ? [self addSearchBar] : [self hideSearchBarIfNotActive];
 
     [self.tableView reloadData];
 }
 
-- (void)setNavigationBarButtonItemsEnabled:(BOOL)boolValue {
-    [self.editBarButtonItem setEnabled:boolValue];
-}
-
 - (void)toolbarItemsSetEnabled:(BOOL)boolValue {
     [_downloadBarButtonItem setEnabled:boolValue];
     [_carbonCopyBarButtonItem setEnabled:boolValue];
@@ -631,6 +620,7 @@ - (void)didTapSelect {
     self.selectedSharesMutableArray = NSMutableArray.alloc.init;
 
     [self configToolbarItemsForSharedItems];
+    [self configNavigationBarButtonItems];
     [self toolbarItemsSetEnabled:NO];
 }
 
@@ -932,13 +922,6 @@ - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger
             }
         }
     }
-    
-    if (numberOfRows == 0) {
-        [self setNavigationBarButtonItemsEnabled:NO];
-    } else {
-        [self setNavigationBarButtonItemsEnabled:YES];
-    }
-    
     return numberOfRows;
 }
 
@@ -1133,7 +1116,7 @@ - (void)tableView:(UITableView *)tableView willPerformPreviewActionForMenuWithCo
 #pragma mark - UISearchBarDelegate
 
 - (void)searchBarCancelButtonClicked:(UISearchBar *)searchBar {
-    self.searchNodesArray = nil;
+    [self.searchNodesArray removeAllObjects];
     [self.searchUnverifiedNodesArray removeAllObjects];
     [self.searchUnverifiedSharesArray removeAllObjects];