felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-04-22 09:32:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

UX rework: directory sticky header: list public rooms from any kind of directory server

Browse Source
This commit is contained in:
manuroe
2017-04-20 11:58:25 +02:00
parent 521c54300f
commit e05dd38bc8
2 changed files with 63 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Model/RoomList/PublicRoomsDirectoryDataSource.m
+46 -1
View File
@@ -59,6 +59,51 @@ double const kPublicRoomsDirectoryDataExpiration = 10;
return self;
}
- (NSString *)directoryServerDisplayname
{
NSString *directoryServerDisplayname;
if (_homeserver)
{
directoryServerDisplayname = _homeserver;
}
else if (_thirdpartyProtocolInstance)
{
directoryServerDisplayname = _thirdpartyProtocolInstance.desc;
}
else
{
directoryServerDisplayname = self.mxSession.matrixRestClient.credentials.homeServer;
}
return directoryServerDisplayname;
}
- (void)setHomeserver:(NSString *)homeserver
{
if (homeserver != _homeserver)
{
_homeserver = homeserver;
_thirdpartyProtocolInstance = nil;
// Reset data
[self startPagination];
}
}
- (void)setThirdpartyProtocolInstance:(MXThirdPartyProtocolInstance *)thirdpartyProtocolInstance
{
if (thirdpartyProtocolInstance != _thirdpartyProtocolInstance)
{
_homeserver = nil;
_thirdpartyProtocolInstance = thirdpartyProtocolInstance;
// Reset data
[self startPagination];
}
}
- (void)setSearchPattern:(NSString *)searchPattern
{
if (searchPattern)
@@ -144,7 +189,7 @@ double const kPublicRoomsDirectoryDataExpiration = 10;
// Get the public rooms from the server
MXHTTPOperation *newPublicRoomsRequest;
newPublicRoomsRequest = [self.mxSession.matrixRestClient publicRoomsOnServer:nil limit:_paginationLimit since:nextBatch filter:_searchPattern thirdPartyInstanceId:nil includeAllNetworks:NO success:^(MXPublicRoomsResponse *publicRoomsResponse) {
newPublicRoomsRequest = [self.mxSession.matrixRestClient publicRoomsOnServer:_homeserver limit:_paginationLimit since:nextBatch filter:_searchPattern thirdPartyInstanceId:_thirdpartyProtocolInstance.instanceId includeAllNetworks:NO success:^(MXPublicRoomsResponse *publicRoomsResponse) {
if (weakSelf)
{