Merge pull request #1694 from nextcloud/fix-crash-on-internal-signaling

Fix missing room controller in join notification
nextcloud · Jul 1, 2024 · a4648f5 · a4648f5
2 parents b3022de + 1066742
commit a4648f5
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/NextcloudTalk/NCRoomsManagerExtensions.swift b/NextcloudTalk/NCRoomsManagerExtensions.swift
@@ -38,20 +38,22 @@ import Foundation
     }
 
     private func joinRoomHelper(_ token: String, forCall call: Bool) {
+        var userInfo: [AnyHashable: Any] = [:]
+        userInfo["token"] = token
+
         if let roomController = self.activeRooms[token] as? NCRoomController {
             if call {
                 roomController.inCall = true
             } else {
                 roomController.inChat = true
             }
 
-            NotificationCenter.default.post(name: .NCRoomsManagerDidJoinRoom, object: self, userInfo: ["token": token])
+            userInfo["roomController"] = roomController
+            NotificationCenter.default.post(name: .NCRoomsManagerDidJoinRoom, object: self, userInfo: userInfo)
 
             return
         }
 
-        var userInfo: [AnyHashable: Any] = [:]
-
         self.joiningRoomToken = token
 
         self.joinRoomHelper(token, forCall: call) { sessionId, room, error, statusCode in
@@ -90,7 +92,6 @@ import Foundation
                 NCUtils.log("Could not join room. Status code: \(statusCode). Error: \(error?.localizedDescription ?? "")")
             }
 
-            userInfo["token"] = token
             NotificationCenter.default.post(name: .NCRoomsManagerDidJoinRoom, object: self, userInfo: userInfo)
         }
     }

diff --git a/NextcloudTalkTests/Integration/IntegrationRoomsManagerTest.swift b/NextcloudTalkTests/Integration/IntegrationRoomsManagerTest.swift
@@ -38,6 +38,9 @@ final class IntegrationRoomsManagerTest: TestBase {
             // swiftlint:disable:next force_cast
             XCTAssertEqual(notification.userInfo?["token"] as! String, roomToken)
 
+            // There's no NCRoomController when joining fails
+            XCTAssertNil(notification.userInfo?["roomController"])
+
             return true
         }
 
@@ -77,6 +80,9 @@ final class IntegrationRoomsManagerTest: TestBase {
             // Check if the NCRoomController was correctly added to the activeRooms dictionary
             XCTAssertNotNil(NCRoomsManager.sharedInstance().activeRooms[roomToken])
 
+            // When successfully joined, the NCRoomController should be included in the notification
+            XCTAssertNotNil(notification.userInfo?["roomController"])
+
             return true
         }