Jitsi: Enable the "Create conference calls with jitsi" settings by default

This commit is contained in:
manuroe
2017-10-03 13:17:07 +02:00
parent d535dcbfb6
commit 6291fda01c
4 changed files with 4 additions and 18 deletions
+1 -7
View File
@@ -2738,7 +2738,6 @@
{
__weak __typeof(self) weakSelf = self;
#ifdef USE_JITSI_WIDGET
// If there is already a jitsi widget, join it
Widget *jitsiWidget = [customizedRoomDataSource jitsiWidget];
if (jitsiWidget)
@@ -2775,11 +2774,8 @@
}
}];
}
else
#endif
// Classic conference call is not supported in encrypted rooms
if (self.roomDataSource.room.state.isEncrypted && self.roomDataSource.room.state.joinedMembers.count > 2)
else if (self.roomDataSource.room.state.isEncrypted && self.roomDataSource.room.state.joinedMembers.count > 2)
{
[currentAlert dismissViewControllerAnimated:NO completion:nil];
@@ -3540,7 +3536,6 @@
} onClosePressed:nil];
}
}
#ifdef USE_JITSI_WIDGET
else if (jitsiWidget)
{
// The room has an active jitsi widget
@@ -3610,7 +3605,6 @@
}];
}
}
#endif
else if ([self checkUnsentMessages] == NO)
{
// Show "scroll to bottom" icon when the most recent message is not visible,