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

Merge remote-tracking branch 'origin/master' into room_summary

Browse Source
This commit is contained in:
manuroe
2017-03-23 16:24:50 +01:00
parent 5aa2e0bb13 e15b465d95
commit 059a08ba8b
13 changed files with 196 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/ViewController/RoomViewController.m
+2 -2
View File
@@ -2285,7 +2285,7 @@
if (unknownDevices)
{
UsersDevicesViewController *usersDevicesViewController = (UsersDevicesViewController *)segue.destinationViewController.childViewControllers.firstObject;
[usersDevicesViewController displayUsersDevices:unknownDevices andMatrixSession:self.roomDataSource.mxSession];
[usersDevicesViewController displayUsersDevices:unknownDevices andMatrixSession:self.roomDataSource.mxSession onComplete:nil];
unknownDevices = nil;
}
@@ -2940,7 +2940,7 @@
- (void)refreshMissedDiscussionsCount:(BOOL)force
{
// Ignore this action when no room is displayed
if (!self.roomDataSource)
if (!self.roomDataSource || !missedDiscussionsBarButtonCustomView)
{
return;
}