diff --git a/ElementX.xcodeproj/project.pbxproj b/ElementX.xcodeproj/project.pbxproj index 233fc09c9..2e7f3ec27 100644 --- a/ElementX.xcodeproj/project.pbxproj +++ b/ElementX.xcodeproj/project.pbxproj @@ -6516,7 +6516,7 @@ repositoryURL = "https://github.com/matrix-org/matrix-rust-components-swift"; requirement = { kind = exactVersion; - version = 1.1.25; + version = 1.1.26; }; }; 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 d55e2d174..c0744d988 100644 --- a/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -129,8 +129,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/matrix-org/matrix-rust-components-swift", "state" : { - "revision" : "45e7564545193e0a820c6fea1e9519af00373bde", - "version" : "1.1.25" + "revision" : "e7bacee684806d125077b032e3848189ad370f3b", + "version" : "1.1.26" } }, { @@ -262,7 +262,7 @@ { "identity" : "swiftui-introspect", "kind" : "remoteSourceControl", - "location" : "https://github.com/siteline/SwiftUI-Introspect", + "location" : "https://github.com/siteline/SwiftUI-Introspect.git", "state" : { "revision" : "b94da693e57eaf79d16464b8b7c90d09cba4e290", "version" : "0.9.2" diff --git a/ElementX/Sources/Screens/RoomScreen/RoomScreenViewModel.swift b/ElementX/Sources/Screens/RoomScreen/RoomScreenViewModel.swift index 7b9b2fd79..0c47cc7d2 100644 --- a/ElementX/Sources/Screens/RoomScreen/RoomScreenViewModel.swift +++ b/ElementX/Sources/Screens/RoomScreen/RoomScreenViewModel.swift @@ -255,6 +255,7 @@ class RoomScreenViewModel: RoomScreenViewModelType, RoomScreenViewModelProtocol guard let self else { return } self.state.roomTitle = roomProxy.roomTitle self.state.roomAvatarURL = roomProxy.avatarURL + self.state.isCallOngoing = roomProxy.isCallOngoing } .store(in: &cancellables) diff --git a/ElementX/Sources/Services/Room/RoomProxy.swift b/ElementX/Sources/Services/Room/RoomProxy.swift index f8da99d46..31977af79 100644 --- a/ElementX/Sources/Services/Room/RoomProxy.swift +++ b/ElementX/Sources/Services/Room/RoomProxy.swift @@ -152,7 +152,7 @@ class RoomProxy: RoomProxyProtocol { } var isCallOngoing: Bool { - false + room.hasActiveRoomCall() } var canonicalAlias: String? { diff --git a/project.yml b/project.yml index 72c680f04..9a51accd5 100644 --- a/project.yml +++ b/project.yml @@ -45,7 +45,7 @@ packages: # Element/Matrix dependencies MatrixRustSDK: url: https://github.com/matrix-org/matrix-rust-components-swift - exactVersion: 1.1.25 + exactVersion: 1.1.26 # path: ../matrix-rust-sdk Compound: url: https://github.com/vector-im/compound-ios