Fix re-joining a call

Signed-off-by: Marcel Müller <[email protected]>
nextcloud · Aug 10, 2024 · acf639a · acf639a
1 parent a09c4a0
commit acf639a
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/NextcloudTalk/NCCallController.m b/NextcloudTalk/NCCallController.m
@@ -319,7 +319,7 @@ - (void)forceReconnect
         self->_disableVideoAtStart = ![self isVideoEnabled];
 
         if (self->_externalSignalingController) {
-            [self->_externalSignalingController forceReconnect];
+            [self->_externalSignalingController forceReconnectForRejoin];
         } else {
             [self rejoinCallUsingInternalSignaling];
         }

diff --git a/NextcloudTalk/NCExternalSignalingController.h b/NextcloudTalk/NCExternalSignalingController.h
@@ -57,6 +57,6 @@ typedef void (^JoinRoomExternalSignalingCompletionBlock)(NSError *error);
 - (void)connect;
 - (void)forceConnect;
 - (void)disconnect;
-- (void)forceReconnect;
+- (void)forceReconnectForRejoin;
 
 @end
diff --git a/NextcloudTalk/NCExternalSignalingController.m b/NextcloudTalk/NCExternalSignalingController.m
@@ -182,6 +182,17 @@ - (void)forceReconnect
     });
 }
 
+- (void)forceReconnectForRejoin
+{
+    // In case we force reconnect in order to rejoin the call again, we need to keep the currently joined room.
+    // In `helloResponseReceived` we determine that we were in a room and that the sessionId changed, in that case
+    // we trigger a re-join in `NCRoomsManager` which takes care of re-joining.
+    dispatch_async(dispatch_get_main_queue(), ^{
+        self->_resumeId = nil;
+        [self reconnect];
+    });
+}
+
 - (void)disconnect
 {
     [NCUtils log:[NSString stringWithFormat:@"Disconnecting from: %@", _serverUrl]];