Hide a room's Call button when already joined to the call.

element-hq · Aug 21, 2024 · ae1facc · ae1facc
1 parent eac1a08
commit ae1facc
Show file tree

Hide file tree

Showing 13 changed files with 97 additions and 10 deletions.
diff --git a/ElementX/Sources/FlowCoordinators/RoomFlowCoordinator.swift b/ElementX/Sources/FlowCoordinators/RoomFlowCoordinator.swift
@@ -58,6 +58,7 @@ class RoomFlowCoordinator: FlowCoordinatorProtocol {
  private let roomTimelineControllerFactory: RoomTimelineControllerFactoryProtocol
  private let navigationStackCoordinator: NavigationStackCoordinator
  private let emojiProvider: EmojiProviderProtocol
+ private let ongoingCallRoomIDPublisher: CurrentValuePublisher<String?, Never>
  private let appMediator: AppMediatorProtocol
  private let appSettings: AppSettings
  private let analytics: AnalyticsService
@@ -90,6 +91,7 @@ class RoomFlowCoordinator: FlowCoordinatorProtocol {
  roomTimelineControllerFactory: RoomTimelineControllerFactoryProtocol,
  navigationStackCoordinator: NavigationStackCoordinator,
  emojiProvider: EmojiProviderProtocol,
+ ongoingCallRoomIDPublisher: CurrentValuePublisher<String?, Never>,
  appMediator: AppMediatorProtocol,
  appSettings: AppSettings,
  analytics: AnalyticsService,
@@ -100,6 +102,7 @@ class RoomFlowCoordinator: FlowCoordinatorProtocol {
  self.roomTimelineControllerFactory = roomTimelineControllerFactory
  self.navigationStackCoordinator = navigationStackCoordinator
  self.emojiProvider = emojiProvider
+ self.ongoingCallRoomIDPublisher = ongoingCallRoomIDPublisher
  self.appMediator = appMediator
  self.appSettings = appSettings
  self.analytics = analytics
@@ -580,6 +583,7 @@ class RoomFlowCoordinator: FlowCoordinatorProtocol {
  voiceMessageMediaManager: userSession.voiceMessageMediaManager,
  emojiProvider: emojiProvider,
  completionSuggestionService: completionSuggestionService,
+ ongoingCallRoomIDPublisher: ongoingCallRoomIDPublisher,
  appMediator: appMediator,
  appSettings: appSettings,
  composerDraftService: composerDraftService)
@@ -1350,6 +1354,7 @@ class RoomFlowCoordinator: FlowCoordinatorProtocol {
  roomTimelineControllerFactory: roomTimelineControllerFactory,
  navigationStackCoordinator: navigationStackCoordinator,
  emojiProvider: emojiProvider,
+ ongoingCallRoomIDPublisher: ongoingCallRoomIDPublisher,
  appMediator: appMediator,
  appSettings: appSettings,
  analytics: analytics,

diff --git a/ElementX/Sources/FlowCoordinators/UserSessionFlowCoordinator.swift b/ElementX/Sources/FlowCoordinators/UserSessionFlowCoordinator.swift
@@ -477,6 +477,7 @@ class UserSessionFlowCoordinator: FlowCoordinatorProtocol {
  roomTimelineControllerFactory: roomTimelineControllerFactory,
  navigationStackCoordinator: detailNavigationStackCoordinator,
  emojiProvider: EmojiProvider(),
+ ongoingCallRoomIDPublisher: elementCallService.ongoingCallRoomIDPublisher,
  appMediator: appMediator,
  appSettings: appSettings,
  analytics: analytics,
@@ -580,7 +581,7 @@ class UserSessionFlowCoordinator: FlowCoordinatorProtocol {
 
  private var callScreenPictureInPictureController: AVPictureInPictureController?
  private func presentCallScreen(configuration: ElementCallConfiguration) {
- guard elementCallService.ongoingCallRoomID != configuration.callRoomID else {
+ guard elementCallService.ongoingCallRoomIDPublisher.value != configuration.callRoomID else {
  MXLog.info("Returning to existing call.")
  callScreenPictureInPictureController?.stopPictureInPicture()
  return

diff --git a/ElementX/Sources/Mocks/ElementCallServiceMock.swift b/ElementX/Sources/Mocks/ElementCallServiceMock.swift
@@ -17,12 +17,15 @@
 import Combine
 import Foundation
 
-struct ElementCallServiceMockConfiguration { }
+struct ElementCallServiceMockConfiguration {
+ var ongoingCallRoomID: String?
+}
 
 extension ElementCallServiceMock {
  convenience init(_ configuration: ElementCallServiceMockConfiguration) {
  self.init()
 
  underlyingActions = PassthroughSubject().eraseToAnyPublisher()
+ underlyingOngoingCallRoomIDPublisher = .init(.init(configuration.ongoingCallRoomID))
  }
 }
diff --git a/ElementX/Sources/Mocks/Generated/GeneratedMocks.swift b/ElementX/Sources/Mocks/Generated/GeneratedMocks.swift
@@ -4894,7 +4894,11 @@ class ElementCallServiceMock: ElementCallServiceProtocol {
  set(value) { underlyingActions = value }
  }
  var underlyingActions: AnyPublisher<ElementCallServiceAction, Never>!
- var ongoingCallRoomID: String?
+ var ongoingCallRoomIDPublisher: CurrentValuePublisher<String?, Never> {
+ get { return underlyingOngoingCallRoomIDPublisher }
+ set(value) { underlyingOngoingCallRoomIDPublisher = value }
+ }
+ var underlyingOngoingCallRoomIDPublisher: CurrentValuePublisher<String?, Never>!
 
  //MARK: - setClientProxy
 

diff --git a/ElementX/Sources/Screens/RoomScreen/RoomScreenCoordinator.swift b/ElementX/Sources/Screens/RoomScreen/RoomScreenCoordinator.swift
@@ -28,6 +28,7 @@ struct RoomScreenCoordinatorParameters {
  let voiceMessageMediaManager: VoiceMessageMediaManagerProtocol
  let emojiProvider: EmojiProviderProtocol
  let completionSuggestionService: CompletionSuggestionServiceProtocol
+ let ongoingCallRoomIDPublisher: CurrentValuePublisher<String?, Never>
  let appMediator: AppMediatorProtocol
  let appSettings: AppSettings
  let composerDraftService: ComposerDraftServiceProtocol
@@ -64,6 +65,7 @@ final class RoomScreenCoordinator: CoordinatorProtocol {
  init(parameters: RoomScreenCoordinatorParameters) {
  roomViewModel = RoomScreenViewModel(roomProxy: parameters.roomProxy,
  mediaProvider: parameters.mediaProvider,
+ ongoingCallRoomIDPublisher: parameters.ongoingCallRoomIDPublisher,
  appMediator: parameters.appMediator,
  appSettings: ServiceLocator.shared.settings,
  analyticsService: ServiceLocator.shared.analytics)

diff --git a/ElementX/Sources/Screens/RoomScreen/RoomScreenModels.swift b/ElementX/Sources/Screens/RoomScreen/RoomScreenModels.swift
@@ -46,6 +46,7 @@ struct RoomScreenViewState: BindableState {
 
  var canJoinCall = false
  var hasOngoingCall: Bool
+ var shouldShowCallButton = true
 
  var bindings: RoomScreenViewStateBindings
 }

diff --git a/ElementX/Sources/Screens/RoomScreen/RoomScreenViewModel.swift b/ElementX/Sources/Screens/RoomScreen/RoomScreenViewModel.swift
@@ -53,6 +53,7 @@ class RoomScreenViewModel: RoomScreenViewModelType, RoomScreenViewModelProtocol
 
  init(roomProxy: JoinedRoomProxyProtocol,
  mediaProvider: MediaProviderProtocol,
+ ongoingCallRoomIDPublisher: CurrentValuePublisher<String?, Never>,
  appMediator: AppMediatorProtocol,
  appSettings: AppSettings,
  analyticsService: AnalyticsService) {
@@ -68,7 +69,7 @@ class RoomScreenViewModel: RoomScreenViewModelType, RoomScreenViewModelProtocol
  bindings: .init()),
  mediaProvider: mediaProvider)
 
- setupSubscriptions()
+ setupSubscriptions(ongoingCallRoomIDPublisher: ongoingCallRoomIDPublisher)
  }
 
  override func process(viewAction: RoomScreenViewAction) {
@@ -93,7 +94,7 @@ class RoomScreenViewModel: RoomScreenViewModelType, RoomScreenViewModelProtocol
  state.lastScrollDirection = direction
  }
 
- private func setupSubscriptions() {
+ private func setupSubscriptions(ongoingCallRoomIDPublisher: CurrentValuePublisher<String?, Never>) {
  let roomInfoSubscription = roomProxy
  .actionsPublisher
  .filter { $0 == .roomInfoUpdate }
@@ -135,6 +136,14 @@ class RoomScreenViewModel: RoomScreenViewModelType, RoomScreenViewModelProtocol
  self?.setupPinnedEventsTimelineProviderIfNeeded()
  }
  .store(in: &cancellables)
+
+ ongoingCallRoomIDPublisher
+ .receive(on: DispatchQueue.main)
+ .sink { [weak self] ongoingCallRoomID in
+ guard let self else { return }
+ state.shouldShowCallButton = ongoingCallRoomID != roomProxy.id
+ }
+ .store(in: &cancellables)
  }
 
  private func buildPinnedEventContents(timelineItems: [TimelineItemProxy]) {
@@ -186,6 +195,7 @@ extension RoomScreenViewModel {
  static func mock(roomProxyMock: JoinedRoomProxyMock) -> RoomScreenViewModel {
  RoomScreenViewModel(roomProxy: roomProxyMock,
  mediaProvider: MockMediaProvider(),
+ ongoingCallRoomIDPublisher: .init(.init(nil)),
  appMediator: AppMediatorMock.default,
  appSettings: ServiceLocator.shared.settings,
  analyticsService: ServiceLocator.shared.analytics)

diff --git a/ElementX/Sources/Screens/RoomScreen/View/RoomScreen.swift b/ElementX/Sources/Screens/RoomScreen/View/RoomScreen.swift
@@ -175,8 +175,10 @@ struct RoomScreen: View {
 
  if !ProcessInfo.processInfo.isiOSAppOnMac {
  ToolbarItem(placement: .primaryAction) {
- callButton
- .disabled(roomContext.viewState.canJoinCall == false)
+ if roomContext.viewState.shouldShowCallButton {
+ callButton
+ .disabled(roomContext.viewState.canJoinCall == false)
+ }
  }
  }
  }

diff --git a/ElementX/Sources/Services/ElementCall/ElementCallService.swift b/ElementX/Sources/Services/ElementCall/ElementCallService.swift
@@ -57,9 +57,14 @@ class ElementCallService: NSObject, ElementCallServiceProtocol, PKPushRegistryDe
 
  private var endUnansweredCallTask: Task<Void, Never>?
 
- private var ongoingCallID: CallID?
+ private var ongoingCallID: CallID? {
+ didSet { ongoingCallRoomIDSubject.send(ongoingCallID?.roomID) }
+ }
 
- var ongoingCallRoomID: String? { ongoingCallID?.roomID }
+ let ongoingCallRoomIDSubject = CurrentValueSubject<String?, Never>(nil)
+ var ongoingCallRoomIDPublisher: CurrentValuePublisher<String?, Never> {
+ ongoingCallRoomIDSubject.asCurrentValuePublisher()
+ }
 
  private let actionsSubject: PassthroughSubject<ElementCallServiceAction, Never> = .init()
  var actions: AnyPublisher<ElementCallServiceAction, Never> {

diff --git a/ElementX/Sources/Services/ElementCall/ElementCallServiceProtocol.swift b/ElementX/Sources/Services/ElementCall/ElementCallServiceProtocol.swift
@@ -26,7 +26,7 @@ enum ElementCallServiceAction {
 protocol ElementCallServiceProtocol {
  var actions: AnyPublisher<ElementCallServiceAction, Never> { get }
 
- var ongoingCallRoomID: String? { get }
+ var ongoingCallRoomIDPublisher: CurrentValuePublisher<String?, Never> { get }
 
  func setClientProxy(_ clientProxy: ClientProxyProtocol)