Merge pull request #1717 from vector-im/group_details_rooms

Group details: Add Rooms page

Riot/ViewController/GroupParticipantsViewController.m

@@ -110,9 +110,7 @@
     
     [NSLayoutConstraint activateConstraints:@[_searchBarTopConstraint, _tableViewBottomConstraint]];
     
-    self.navigationItem.title = NSLocalizedStringFromTable(@"group_participants_title", @"Vector", nil);
-    
-    _searchBarView.placeholder = NSLocalizedStringFromTable(@"group_participants_filter_group_members", @"Vector", nil);
+    _searchBarView.placeholder = NSLocalizedStringFromTable(@"group_participants_filter_members", @"Vector", nil);
     _searchBarView.returnKeyType = UIReturnKeyDone;
     _searchBarView.autocapitalizationType = UITextAutocapitalizationTypeNone;
     
@@ -357,8 +355,6 @@
     
     // Refresh the members list.
     [self refreshParticipantsList];
-    
-    [self refreshTableView];
 }
 
 - (void)startActivityIndicator
@@ -569,17 +565,8 @@
         actualParticipants = nil;
         invitedParticipants = nil;
     }
-}
-
-- (void)reloadSearchResult
-{
-    if (currentSearchText.length)
-    {
-        NSString *searchText = currentSearchText;
-        currentSearchText = nil;
-        
-        [self searchBar:_searchBarView textDidChange:searchText];
-    }
+    
+    [self finalizeParticipantsList];
 }
 
 - (void)finalizeParticipantsList
@@ -608,7 +595,17 @@
     [invitedParticipants sortUsingComparator:comparator];
     
     // Reload search result if any
-    [self reloadSearchResult];
+    if (currentSearchText.length)
+    {
+        NSString *searchText = currentSearchText;
+        currentSearchText = nil;
+        
+        [self searchBar:_searchBarView textDidChange:searchText];
+    }
+    else
+    {
+        [self refreshTableView];
+    }
 }
 
 - (void)addPendingActionMask