Jitsi widget: add display or creation of jitsi conference under USE_JITSI_WIDGET compilation flag

This commit is contained in:
manuroe
2017-08-18 11:56:32 +02:00
parent 00f4d1da39
commit a7cfb02f1f
3 changed files with 16 additions and 2 deletions
+6 -1
View File
@@ -2689,6 +2689,7 @@
{
__weak __typeof(self) weakSelf = self;
#ifdef USE_JITSI_WIDGET
// If there is already a jitsi widget, join it
Widget *jitsiWidget = [customizedRoomDataSource jitsiWidget];
if (jitsiWidget)
@@ -2725,9 +2726,11 @@
}
}];
}
else
#endif
// Classic conference call is not supported in encrypted rooms
else if (self.roomDataSource.room.state.isEncrypted && self.roomDataSource.room.state.joinedMembers.count > 2)
if (self.roomDataSource.room.state.isEncrypted && self.roomDataSource.room.state.joinedMembers.count > 2)
{
[currentAlert dismissViewControllerAnimated:NO completion:nil];
@@ -3459,6 +3462,7 @@
} onClosePressed:nil];
}
}
#ifdef USE_JITSI_WIDGET
else if (jitsiWidget)
{
// The room has an active jitsi widget
@@ -3528,6 +3532,7 @@
}];
}
}
#endif
else if ([self checkUnsentMessages] == NO)
{
// Show "scroll to bottom" icon when the most recent message is not visible,