diff --git a/ElementX.xcodeproj/project.pbxproj b/ElementX.xcodeproj/project.pbxproj index 4176ffc1f..03d6f351a 100644 --- a/ElementX.xcodeproj/project.pbxproj +++ b/ElementX.xcodeproj/project.pbxproj @@ -9363,7 +9363,7 @@ repositoryURL = "https://github.com/element-hq/element-call-swift"; requirement = { kind = exactVersion; - version = "0.16.0-rc.3"; + version = "0.16.0-rc.4"; }; }; 821C67C9A7F8CC3FD41B28B4 /* XCRemoteSwiftPackageReference "emojibase-bindings" */ = { diff --git a/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 3879da925..7aaabe289 100644 --- a/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -59,8 +59,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/element-hq/element-call-swift", "state" : { - "revision" : "48523e02e3ea1e9d1b8c1ca8652c37ff64299187", - "version" : "0.16.0-rc.3" + "revision" : "3e2571a11f611761114038225ef368dd9ac83805", + "version" : "0.16.0-rc.4" } }, { diff --git a/ElementX/Sources/Screens/CallScreen/CallScreenModels.swift b/ElementX/Sources/Screens/CallScreen/CallScreenModels.swift index 805cfce51..3cc9a9b5e 100644 --- a/ElementX/Sources/Screens/CallScreen/CallScreenModels.swift +++ b/ElementX/Sources/Screens/CallScreen/CallScreenModels.swift @@ -106,7 +106,7 @@ enum CallScreenJavaScriptMessageName: String, CaseIterable { struct DecodedWidgetMessage: Decodable { private static let decoder = JSONDecoder() - private static let joinAction = "io.element.join" + private static let contentLoadedAction = "content_loaded" private static let fromWidget = "fromWidget" let action: String? @@ -119,7 +119,7 @@ struct DecodedWidgetMessage: Decodable { return try decoder.decode(DecodedWidgetMessage.self, from: data) } - var hasJoined: Bool { - action == Self.joinAction && api == Self.fromWidget + var hasLoaded: Bool { + action == Self.contentLoadedAction && api == Self.fromWidget } } diff --git a/ElementX/Sources/Screens/CallScreen/CallScreenViewModel.swift b/ElementX/Sources/Screens/CallScreen/CallScreenViewModel.swift index fd5923eae..aa4c85553 100644 --- a/ElementX/Sources/Screens/CallScreen/CallScreenViewModel.swift +++ b/ElementX/Sources/Screens/CallScreen/CallScreenViewModel.swift @@ -153,7 +153,7 @@ class CallScreenViewModel: CallScreenViewModelType, CallScreenViewModelProtocol private func handleWidgetAction(message: String) async { if timeoutTask != nil, let decodedMessage = try? DecodedWidgetMessage.decode(message: message), - decodedMessage.hasJoined { + decodedMessage.hasLoaded { // This means that the call room was joined succesfully, we can stop the timeout task timeoutTask = nil } diff --git a/project.yml b/project.yml index 352f36c91..deef14c8e 100644 --- a/project.yml +++ b/project.yml @@ -80,7 +80,7 @@ packages: # path: ../matrix-analytics-events EmbeddedElementCall: url: https://github.com/element-hq/element-call-swift - exactVersion: 0.16.0-rc.3 + exactVersion: 0.16.0-rc.4 Emojibase: url: https://github.com/matrix-org/emojibase-bindings minorVersion: 1.4.2