Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Check call enabled flag local and remote #1758

Merged
merged 1 commit into from
Aug 12, 2024
Merged

Check call enabled flag local and remote #1758

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions NextcloudTalk/NCRoom.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,17 +58,23 @@ import Realm
return false
}

public var supportsFederationV2: Bool {
public var supportsFederatedCalling: Bool {
guard self.isFederated else { return false }

let remoteSupported = NCDatabaseManager.sharedInstance().roomHasTalkCapability(kCapabilityFederationV2, for: self)
let localSupported = NCDatabaseManager.sharedInstance().serverHasTalkCapability(kCapabilityFederationV2, forAccountId: self.accountId)
let remoteCapabilitySupported = NCDatabaseManager.sharedInstance().roomHasTalkCapability(kCapabilityFederationV2, for: self)
let localCapabilitySupported = NCDatabaseManager.sharedInstance().serverHasTalkCapability(kCapabilityFederationV2, forAccountId: self.accountId)

return remoteSupported && localSupported
let remoteCallingEnabled = NCDatabaseManager.sharedInstance().roomTalkCapabilities(for: self)?.callEnabled ?? false
let localCallingEnabled = NCDatabaseManager.sharedInstance().serverCapabilities(forAccountId: self.accountId)?.callEnabled ?? false

let capabilitySupported = remoteCapabilitySupported && localCapabilitySupported
let callingEnabled = remoteCallingEnabled && localCallingEnabled

return capabilitySupported && callingEnabled
}

public var supportsCalling: Bool {
if self.isFederated, !self.supportsFederationV2 {
if self.isFederated, !self.supportsFederatedCalling {
return false
}

Expand Down
2 changes: 1 addition & 1 deletion NextcloudTalk/NCRoomsManagerExtensions.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ import Foundation

private func getSignalingSettingsHelper(for account: TalkAccount, forRoom token: String, withCompletion completion: @escaping (SignalingSettings?) -> Void) {
// Currently we only need the signaling settings in case the room supports federation-v2
if let room = NCDatabaseManager.sharedInstance().room(withToken: token, forAccountId: account.accountId), room.supportsFederationV2 {
if let room = NCDatabaseManager.sharedInstance().room(withToken: token, forAccountId: account.accountId), room.supportsFederatedCalling {
NCAPIController.sharedInstance().getSignalingSettings(for: account, forRoom: token) { signalingSettings, _ in
completion(signalingSettings)
}
Expand Down
Loading