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

Public rooms search: Directory page starts to work (with cells from MatrixKit)

Browse Source
This commit is contained in:
manuroe
2015-12-18 17:17:03 +01:00
parent 10de4757d3
commit e71a4a090d
11 changed files with 108 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Vector/Model/RoomList/RecentsDataSource.m
+11 -13
View File
@@ -32,8 +32,6 @@
NSMutableArray* conversationCellDataArray;
NSMutableArray* lowPriorityCellDataArray;
PublicRoomsDirectoryDataSource *publicRoomsDirectoryDataSource;
NSInteger directorySection;
NSInteger invitesSection;
NSInteger favoritesSection;
@@ -80,10 +78,10 @@
// Initialise the public room directory data source
// Note that it is single matrix session only for now
if (!publicRoomsDirectoryDataSource)
if (!_publicRoomsDirectoryDataSource)
{
publicRoomsDirectoryDataSource = [[PublicRoomsDirectoryDataSource alloc] initWithMatrixSession:mxSession];
publicRoomsDirectoryDataSource.delegate = self;
_publicRoomsDirectoryDataSource = [[PublicRoomsDirectoryDataSource alloc] initWithMatrixSession:mxSession];
_publicRoomsDirectoryDataSource.delegate = self;
}
}
@@ -102,17 +100,17 @@
[roomTagsListenerByUserId removeObjectForKey:matrixSession.myUser.userId];
}
if (publicRoomsDirectoryDataSource.mxSession == matrixSession)
if (_publicRoomsDirectoryDataSource.mxSession == matrixSession)
{
[publicRoomsDirectoryDataSource destroy];
publicRoomsDirectoryDataSource = nil;
[_publicRoomsDirectoryDataSource destroy];
_publicRoomsDirectoryDataSource = nil;
}
}
}
- (void)dataSource:(MXKDataSource*)dataSource didStateChange:(MXKDataSourceState)aState
{
if (dataSource == publicRoomsDirectoryDataSource)
if (dataSource == _publicRoomsDirectoryDataSource)
{
[self refreshRoomsSectionsAndReload];
}
@@ -294,7 +292,7 @@
directoryCell = [[DirectoryRecentTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:[DirectoryRecentTableViewCell defaultReuseIdentifier]];
}
[directoryCell render:publicRoomsDirectoryDataSource];
[directoryCell render:_publicRoomsDirectoryDataSource];
return directoryCell;
}
@@ -529,7 +527,7 @@
// Manage the public room search results cell outside the recents.
// Show the cell showing the public rooms directory search result
// once a search is active
if (publicRoomsDirectoryDataSource.filter)
if (_publicRoomsDirectoryDataSource.filter)
{
directorySection = sectionIndex;
sectionIndex++;
@@ -653,11 +651,11 @@
{
[super searchWithPatterns:patternsList];
if (patternsList && publicRoomsDirectoryDataSource)
if (patternsList && _publicRoomsDirectoryDataSource)
{
// Search only on the first pattern
// XXX: Why is it an array?
publicRoomsDirectoryDataSource.filter = patternsList[0];
_publicRoomsDirectoryDataSource.filter = patternsList[0];
}
}