felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-05-01 05:36:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

Public rooms search: Replace the PublicRoomsDirectoryDataSource.filter by an array of strings PublicRoomsDirectoryDataSource.searchPatternsList.

Browse Source
This commit is contained in:
manuroe
2015-12-21 15:29:57 +01:00
parent 056bf23f4d
commit 94fbcc076f
4 changed files with 25 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Vector/Model/RoomList/PublicRoomsDirectoryDataSource.m
+14 -6
View File
@@ -38,11 +38,14 @@ double const kPublicRoomsDirectoryDataExpiration = 10;
@implementation PublicRoomsDirectoryDataSource
- (void)setFilter:(NSString *)searchTerm
- (void)setSearchPatternsList:(NSArray<NSString *> *)newSearchPatternsList
{
if (![searchTerm isEqualToString:_filter])
NSString *searchPatternsListString = [_searchPatternsList componentsJoinedByString:@""];
NSString *newSearchPatternsListString = [newSearchPatternsList componentsJoinedByString:@""];
if (![newSearchPatternsListString isEqualToString:searchPatternsListString])
{
_filter = searchTerm;
_searchPatternsList = newSearchPatternsList;
[self refreshPublicRooms];
}
}
@@ -114,16 +117,21 @@ double const kPublicRoomsDirectoryDataExpiration = 10;
- (void)refreshFilteredPublicRooms
{
// Apply filter if any
if (_filter)
if (_searchPatternsList)
{
NSMutableArray *filteredRooms = [NSMutableArray array];
for (MXPublicRoom *publicRoom in _rooms)
{
if ([filteredRooms indexOfObjectIdenticalTo:publicRoom] == NSNotFound)
{
if ([publicRoom.displayname rangeOfString:_filter options:NSCaseInsensitiveSearch].location != NSNotFound)
// Do a OR search
for (NSString *pattern in _searchPatternsList)
{
[filteredRooms addObject:publicRoom];
if ([publicRoom.displayname rangeOfString:pattern options:NSCaseInsensitiveSearch].location != NSNotFound)
{
[filteredRooms addObject:publicRoom];
break;
}
}
}
}