Matrix/element-ios
Matrix/element-ios
1
0
Fork 0
mirror of https://github.com/vector-im/element-ios.git synced 2024-09-29 07:42:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

Bug Fix - Search from rooms list: bg bubbles recovering known contacts list

Browse source 
#946
This commit is contained in:
giomfo 2017-01-19 14:28:44 +01:00
parent 95bfd3fd83
commit bcdfb40b8e
5 changed files with 27 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Vector/ViewController/ContactsTableViewController.h
View file

@ -112,8 +112,9 @@
@param searchText the search pattern (nil to reset filtering).
@param forceReset tell whether the search request must be applied by ignoring the previous search result if any (use NO by default).
@param complete a block object called when the operation is complete.
*/
- (void)searchWithPattern:(NSString *)searchText forceReset:(BOOL)forceReset;
- (void)searchWithPattern:(NSString *)searchText forceReset:(BOOL)forceReset complete:(void (^)())complete;
/**
Refresh the contacts table display.

15
Vector/ViewController/ContactsTableViewController.m
View file

@ -215,7 +215,7 @@
}
}
- (void)searchWithPattern:(NSString *)searchText forceReset:(BOOL)forceRefresh
- (void)searchWithPattern:(NSString *)searchText forceReset:(BOOL)forceRefresh complete:(void (^)())complete
{
// Update search results.
searchText = [searchText stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]];
@ -348,12 +348,17 @@
// Force scroll to top
[self.tableView setContentOffset:CGPointMake(-self.tableView.contentInset.left, -self.tableView.contentInset.top) animated:NO];
if (complete)
{
complete();
}
}
else
{
// Launch a new search
forceSearchResultRefresh = NO;
[self searchWithPattern:searchProcessingText forceReset:YES];
[self searchWithPattern:searchProcessingText forceReset:YES complete:complete];
}
}
});
@ -378,7 +383,7 @@
}
// Refresh the search result
[self searchWithPattern:currentSearchText forceReset:YES];
[self searchWithPattern:currentSearchText forceReset:YES complete:nil];
}
- (NSMutableArray<MXKContact*>*)unfilteredLocalContactsArray
@ -726,7 +731,7 @@
- (void)searchBar:(UISearchBar *)searchBar textDidChange:(NSString *)searchText
{
[self searchWithPattern:searchText forceReset:NO];
[self searchWithPattern:searchText forceReset:NO complete:nil];
}
- (void)searchBarSearchButtonClicked:(UISearchBar *)searchBar
@ -754,7 +759,7 @@
searchBar.text = nil;
// Reset filtering
[self searchWithPattern:nil forceReset:NO];
[self searchWithPattern:nil forceReset:NO complete:nil];
// Leave search
[searchBar resignFirstResponder];

14
Vector/ViewController/HomeViewController.m
View file

@ -1131,7 +1131,11 @@
}
else if (self.selectedViewController == peopleSearchViewController)
{
[peopleSearchViewController searchWithPattern:self.searchBar.text forceReset:NO];
[peopleSearchViewController searchWithPattern:self.searchBar.text forceReset:NO complete:^{
[self checkAndShowBackgroundImage];
}];
}
else if (self.selectedViewController == filesSearchViewController)
{
@ -1159,7 +1163,13 @@
{
[messagesSearchDataSource searchMessages:nil force:NO];
}
[peopleSearchViewController searchWithPattern:nil forceReset:NO];
[peopleSearchViewController searchWithPattern:nil forceReset:NO complete:^{
[self checkAndShowBackgroundImage];
}];
if (filesSearchDataSource.searchText.length)
{
[filesSearchDataSource searchMessages:nil force:NO];

2
Vector/ViewController/RoomParticipantsViewController.m
View file

@ -583,7 +583,7 @@
if (currentSearchText)
{
contactsPickerViewController.searchBar.text = currentSearchText;
[contactsPickerViewController searchWithPattern:currentSearchText forceReset:YES];
[contactsPickerViewController searchWithPattern:currentSearchText forceReset:YES complete:nil];
}
[self pushViewController:contactsPickerViewController];

4
Vector/ViewController/StartChatViewController.m
View file

@ -586,7 +586,7 @@
- (void)searchBar:(UISearchBar *)searchBar textDidChange:(NSString *)searchText
{
[self searchWithPattern:searchText forceReset:NO];
[self searchWithPattern:searchText forceReset:NO complete:nil];
}
- (BOOL)searchBarShouldBeginEditing:(UISearchBar *)searchBar
@ -632,7 +632,7 @@
self.isAddParticipantSearchBarEditing = NO;
// Reset filtering
[self searchWithPattern:nil forceReset:NO];
[self searchWithPattern:nil forceReset:NO complete:nil];
// Leave search
[searchBar resignFirstResponder];