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

Directory server list: List user's HS directories too

Browse Source 
List the rooms of the selected HS
This commit is contained in:
manuroe
2017-04-21 16:35:27 +02:00
parent 2d2eb09c81
commit 6eb6882d69
5 changed files with 33 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/ViewController/DirectoryServerPickerViewController.m
+4 -12
View File
@@ -26,7 +26,7 @@
// Observe kAppDelegateDidTapStatusBarNotification to handle tap on clock status bar.
id kAppDelegateDidTapStatusBarNotificationObserver;
void (^onCompleteBlock)(MXThirdPartyProtocolInstance *thirdpartyProtocolInstance, NSString *homeserver);
void (^onCompleteBlock)(id<MXKDirectoryServerCellDataStoring> cellData);
}
@end
@@ -110,7 +110,7 @@
}
- (void)displayWithDataSource:(MXKDirectoryServersDataSource*)theDataSource
onComplete:(void (^)(MXThirdPartyProtocolInstance *thirdpartyProtocolInstance, NSString *homeserver))onComplete;
onComplete:(void (^)(id<MXKDirectoryServerCellDataStoring> cellData))onComplete;
{
dataSource = theDataSource;
onCompleteBlock = onComplete;
@@ -165,15 +165,7 @@
if (onCompleteBlock)
{
if (cellData.thirdPartyProtocolInstance)
{
onCompleteBlock(cellData.thirdPartyProtocolInstance, nil);
}
// TODO: Manage adding of homeserver URL
// else if (cellData.homeserverUrl)
// {
// onCompleteBlock(nil, cellData.homeserverUrl);
// }
onCompleteBlock(cellData);
}
[self withdrawViewControllerAnimated:YES completion:nil];
@@ -185,7 +177,7 @@
{
if (onCompleteBlock)
{
onCompleteBlock(nil, nil);
onCompleteBlock(nil);
}
[self withdrawViewControllerAnimated:YES completion:nil];