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

Remove automatically hiding call button when no Jitsi URL is available

Browse Source
This commit is contained in:
aringenbach
2022-03-22 15:38:53 +01:00
parent ab518b3b1e
commit e5157dbe92
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Config/BuildSettings.swift
+1
View File
@@ -206,6 +206,7 @@ final class BuildSettings: NSObject {
] ]
// Jitsi server used outside integrations to create conference calls from the call button in the timeline. // Jitsi server used outside integrations to create conference calls from the call button in the timeline.
// Setting this to nil effectively disables Jitsi conference calls (given that there is no wellknown override). // Setting this to nil effectively disables Jitsi conference calls (given that there is no wellknown override).
// Note: this will not remove the conference call button, use roomScreenAllowVoIPForNonDirectRoom setting.
static let jitsiServerUrl: URL? = URL(string: "https://jitsi.riot.im") static let jitsiServerUrl: URL? = URL(string: "https://jitsi.riot.im")
Riot/Modules/Room/RoomViewController.m
+1 -2
View File
@@ -1611,8 +1611,7 @@ static CGSize kThreadListBarButtonItemImageSize;
{ {
return NO; return NO;
} }
BOOL callOptionAllowed = (self.roomDataSource.room.isDirect && RiotSettings.shared.roomScreenAllowVoIPForDirectRoom) BOOL callOptionAllowed = (self.roomDataSource.room.isDirect && RiotSettings.shared.roomScreenAllowVoIPForDirectRoom) || (!self.roomDataSource.room.isDirect && RiotSettings.shared.roomScreenAllowVoIPForNonDirectRoom);
|| (!self.roomDataSource.room.isDirect && RiotSettings.shared.roomScreenAllowVoIPForNonDirectRoom && self.mainSession.vc_homeserverConfiguration.jitsi.serverURL);
return callOptionAllowed && BuildSettings.allowVoIPUsage && self.roomDataSource.mxSession.callManager && self.roomDataSource.room.summary.membersCount.joined >= 2; return callOptionAllowed && BuildSettings.allowVoIPUsage && self.roomDataSource.mxSession.callManager && self.roomDataSource.room.summary.membersCount.joined >= 2;
} }