Merge pull request #1686 from nextcloud/external-signaling-remove-ise…

…nabled Remove isEnabled from external signaling controller
nextcloud · Jun 25, 2024 · 3851be7 · 3851be7
2 parents 7bddfda + f28e02d
commit 3851be7
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 27 deletions.
diff --git a/NextcloudTalk/DiagnosticsTableViewController.swift b/NextcloudTalk/DiagnosticsTableViewController.swift
@@ -118,7 +118,7 @@ class DiagnosticsTableViewController: UITableViewController {
         // Build signaling sections based on external signaling server
         signalingSections.append(AllSignalingSections.kSignalingSectionMode.rawValue)
 
-        if externalSignalingController?.isEnabled() ?? false {
+        if externalSignalingController != nil {
             signalingSections.append(AllSignalingSections.kSignalingSectionVersion.rawValue)
         }
 
@@ -589,7 +589,7 @@ class DiagnosticsTableViewController: UITableViewController {
 
         switch allSectionsIndex {
         case AllSignalingSections.kSignalingSectionMode.rawValue:
-            let externalSignalingServerUsed = externalSignalingController?.isEnabled() ?? false
+            let externalSignalingServerUsed = externalSignalingController != nil
 
             cell.textLabel?.text = NSLocalizedString("Mode", comment: "The signaling mode used")
 

diff --git a/NextcloudTalk/NCCallController.m b/NextcloudTalk/NCCallController.m
@@ -173,7 +173,7 @@ - (void)startCall
 
 - (NSString *)signalingSessionId
 {
-    if ([_externalSignalingController isEnabled]) {
+    if (_externalSignalingController) {
         return [_externalSignalingController sessionId];
     }
     return _userSessionId;
@@ -203,7 +203,7 @@ - (void)joinCall
                 [self getPeersForCall];
                 [self startMonitoringMicrophoneAudioLevel];
 
-                if ([self->_externalSignalingController isEnabled]) {
+                if (self->_externalSignalingController) {
                     if ([self->_externalSignalingController hasMCU]) {
                         [self createPublisherPeerConnection];
                     }
@@ -332,7 +332,7 @@ - (void)forceReconnect
         self->_disableAudioAtStart = ![self isAudioEnabled];
         self->_disableVideoAtStart = ![self isVideoEnabled];
 
-        if ([self->_externalSignalingController isEnabled]) {
+        if (self->_externalSignalingController) {
             [self->_externalSignalingController forceReconnect];
         } else {
             [self rejoinCallUsingInternalSignaling];
@@ -517,7 +517,7 @@ - (void)raiseHand:(BOOL)raised
                                                                           roomType:peer.roomType
                                                                            payload:payload];
 
-            if ([self->_externalSignalingController isEnabled]) {
+            if (self->_externalSignalingController) {
                 [self->_externalSignalingController sendCallMessage:message];
             } else {
                 [self->_signalingController sendSignalingMessage:message];
@@ -559,7 +559,7 @@ - (void)sendReaction:(NSString *)reaction
                                                                         roomType:peer.roomType
                                                                          payload:payload];
 
-            if ([self->_externalSignalingController isEnabled]) {
+            if (self->_externalSignalingController) {
                 [self->_externalSignalingController sendCallMessage:message];
             } else {
                 [self->_signalingController sendSignalingMessage:message];
@@ -989,7 +989,7 @@ - (void)sendMessageToAllOfType:(NSString *)type withPayload:(id)payload
     }
 
     // Send a signaling message only if we are using an external signaling server
-    if (![self->_externalSignalingController isEnabled]) {
+    if (!self->_externalSignalingController) {
         return;
     }
 
@@ -1586,7 +1586,7 @@ - (NSString *)getUserIdFromSessionId:(NSString *)sessionId
 {
     [[WebRTCCommon shared] assertQueue];
 
-    if ([_externalSignalingController isEnabled]) {
+    if (_externalSignalingController) {
         return [_externalSignalingController getUserIdFromSessionId:sessionId];
     }
 
@@ -1608,7 +1608,7 @@ - (NSString *)getDisplayNameFromSessionId:(NSString *)sessionId
 {
     [[WebRTCCommon shared] assertQueue];
 
-    if ([_externalSignalingController isEnabled]) {
+    if (_externalSignalingController) {
         return [_externalSignalingController getDisplayNameFromSessionId:sessionId];
     }
     for (NSMutableDictionary *user in _peersInCall) {
@@ -1695,7 +1695,7 @@ - (void)peerConnection:(NCPeerConnection *)peerConnection didGenerateIceCandidat
                                                                              roomType:peerConnection.roomType
                                                                           broadcaster:peerConnection.isOwnScreensharePeer ? [self signalingSessionId] : nil];
 
-    if ([_externalSignalingController isEnabled]) {
+    if (_externalSignalingController) {
         [_externalSignalingController sendCallMessage:message];
     } else {
         [_signalingController sendSignalingMessage:message];
@@ -1713,7 +1713,7 @@ - (void)peerConnection:(NCPeerConnection *)peerConnection needsToSendSessionDesc
                                             broadcaster:peerConnection.isOwnScreensharePeer ? [self signalingSessionId] : nil
                                             nick:_userDisplayName];
 
-    if ([_externalSignalingController isEnabled]) {
+    if (_externalSignalingController) {
         [_externalSignalingController sendCallMessage:message];
     } else {
         [_signalingController sendSignalingMessage:message];

diff --git a/NextcloudTalk/NCExternalSignalingController.h b/NextcloudTalk/NCExternalSignalingController.h
@@ -60,7 +60,6 @@ typedef void (^JoinRoomExternalSignalingCompletionBlock)(NSError *error);
 @property (nonatomic, weak) id<NCExternalSignalingControllerDelegate> delegate;
 
 - (instancetype)initWithAccount:(TalkAccount *)account server:(NSString *)serverUrl andTicket:(NSString *)ticket;
-- (BOOL)isEnabled;
 - (BOOL)hasMCU;
 - (NSString *)sessionId;
 - (void)joinRoom:(NSString *)roomId withSessionId:(NSString *)sessionId withCompletionBlock:(JoinRoomExternalSignalingCompletionBlock)block;

diff --git a/NextcloudTalk/NCExternalSignalingController.m b/NextcloudTalk/NCExternalSignalingController.m
@@ -77,11 +77,6 @@ - (instancetype)initWithAccount:(TalkAccount *)account server:(NSString *)server
     return self;
 }
 
-- (BOOL)isEnabled
-{
-    return (_serverUrl) ? YES : NO;
-}
-
 - (BOOL)hasMCU
 {
     return _mcuSupport;

diff --git a/NextcloudTalk/NCRoomsManager.m b/NextcloudTalk/NCRoomsManager.m
@@ -371,7 +371,7 @@ - (void)startChatInRoom:(NCRoom *)room
         // Workaround until external signaling supports multi-room
         TalkAccount *activeAccount = [[NCDatabaseManager sharedInstance] activeAccount];
         NCExternalSignalingController *extSignalingController = [[NCSettingsController sharedInstance] externalSignalingControllerForAccountId:activeAccount.accountId];
-        if ([extSignalingController isEnabled]) {
+        if (extSignalingController) {
             NSString *currentRoom = extSignalingController.currentRoom;
             if (![currentRoom isEqualToString:room.token]) {
                 // Since we are going to join another conversation, we don't need to leaveRoom() in extSignalingController.
@@ -448,7 +448,7 @@ - (void)startCall:(BOOL)video inRoom:(NCRoom *)room withVideoEnabled:(BOOL)enabl
 
         // Workaround until external signaling supports multi-room
         NCExternalSignalingController *extSignalingController = [[NCSettingsController sharedInstance] externalSignalingControllerForAccountId:activeAccount.accountId];
-        if ([extSignalingController isEnabled]) {
+        if (extSignalingController) {
             NSString *extSignalingRoomToken = extSignalingController.currentRoom;
 
             if (![extSignalingRoomToken isEqualToString:joiningRoomToken]) {

diff --git a/NextcloudTalk/NCRoomsManagerExtensions.swift b/NextcloudTalk/NCRoomsManagerExtensions.swift
@@ -170,9 +170,7 @@ import Foundation
                 roomController.inChat = true
 
                 if let extSignalingController = NCSettingsController.sharedInstance().externalSignalingController(forAccountId: activeAccount.accountId) {
-                    if extSignalingController.isEnabled() {
-                        extSignalingController.joinRoom(token, withSessionId: sessionId, withCompletionBlock: nil)
-                    }
+                    extSignalingController.joinRoom(token, withSessionId: sessionId, withCompletionBlock: nil)
                 }
             } else {
                 print("Could not re-join room. Status code: \(statusCode). Error: \(error?.localizedDescription ?? "Unknown")")
@@ -206,9 +204,7 @@ import Foundation
                     print("Could not exit room. Error: \(error.localizedDescription)")
                 } else {
                     if let extSignalingController = NCSettingsController.sharedInstance().externalSignalingController(forAccountId: activeAccount.accountId) {
-                        if extSignalingController.isEnabled() {
-                            extSignalingController.leaveRoom(token)
-                        }
+                        extSignalingController.leaveRoom(token)
                     }
                 }
 

diff --git a/NextcloudTalk/SettingsTableViewController.swift b/NextcloudTalk/SettingsTableViewController.swift
@@ -886,7 +886,7 @@ extension SettingsTableViewController {
             typingIndicatorSwitch.isOn = !serverCapabilities.typingPrivacy
 
             let externalSignalingController = NCSettingsController.sharedInstance().externalSignalingController(forAccountId: activeAccount.accountId)
-            let externalSignalingServerUsed = externalSignalingController?.isEnabled() ?? false
+            let externalSignalingServerUsed = externalSignalingController != nil
 
             if !externalSignalingServerUsed {
                 cell.detailTextLabel?.text = NSLocalizedString("Typing indicators are only available when using a high performance backend (HPB)", comment: "")