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

Merge remote-tracking branch 'origin/develop' into vector_301

Browse Source
This commit is contained in:
manuroe
2016-08-09 14:17:18 +02:00
parent 28b477a00e
commit 80c632dd28
18 changed files with 300 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Vector/ViewController/ContactDetailsViewController.m
+2 -2
View File
@@ -702,7 +702,7 @@
// Place the call directly if the room exists
if (oneToOneRoom)
{
[self.mainSession.callManager placeCallInRoom:oneToOneRoom.state.roomId withVideo:isVideoCall];
[oneToOneRoom placeCallWithVideo:isVideoCall success:nil failure:nil];
[self removePendingActionMask];
}
else
@@ -719,7 +719,7 @@
// Delay the call in order to be sure that the room is ready
dispatch_async(dispatch_get_main_queue(), ^{
[self.mainSession.callManager placeCallInRoom:room.state.roomId withVideo:isVideoCall];
[room placeCallWithVideo:isVideoCall success:nil failure:nil];
[self removePendingActionMask];
});