From cda1872b8f96d02ea2ef906c5be65d2f159b5392 Mon Sep 17 00:00:00 2001 From: Doug Date: Wed, 27 Aug 2025 17:33:26 +0100 Subject: [PATCH] Use the UserSession for VoiceMessageMediaManager injection too. --- .../MediaEventsTimelineFlowCoordinator.swift | 1 - .../PinnedEventsTimelineFlowCoordinator.swift | 1 - .../FlowCoordinators/RoomFlowCoordinator.swift | 2 -- .../MediaEventsTimelineScreenCoordinator.swift | 3 --- .../View/MediaEventsTimelineScreen.swift | 1 - .../PinnedEventsTimelineScreenCoordinator.swift | 2 -- .../View/PinnedEventsTimelineScreen.swift | 1 - .../Screens/RoomScreen/RoomScreenCoordinator.swift | 2 -- .../Screens/RoomScreen/View/RoomScreen.swift | 1 - .../ThreadTimelineScreenCoordinator.swift | 2 -- .../Timeline/TimelineInteractionHandler.swift | 6 +----- .../Screens/Timeline/TimelineViewModel.swift | 3 --- .../View/ReadReceipts/ReadReceiptsSummaryView.swift | 1 - .../View/Style/TimelineItemBubbledStylerView.swift | 1 - .../Supplementary/TimelineReadReceiptsView.swift | 1 - .../HighlightedTimelineItemModifier.swift | 1 - .../Screens/Timeline/View/TimelineView.swift | 1 - .../Sources/UITests/UITestsAppCoordinator.swift | 13 ------------- UnitTests/Sources/PillContextTests.swift | 11 ----------- UnitTests/Sources/TimelineViewModelTests.swift | 8 -------- 20 files changed, 1 insertion(+), 61 deletions(-) diff --git a/ElementX/Sources/FlowCoordinators/MediaEventsTimelineFlowCoordinator.swift b/ElementX/Sources/FlowCoordinators/MediaEventsTimelineFlowCoordinator.swift index c33fa5e18..7374f4fc5 100644 --- a/ElementX/Sources/FlowCoordinators/MediaEventsTimelineFlowCoordinator.swift +++ b/ElementX/Sources/FlowCoordinators/MediaEventsTimelineFlowCoordinator.swift @@ -79,7 +79,6 @@ class MediaEventsTimelineFlowCoordinator: FlowCoordinatorProtocol { filesTimelineController: filesTimelineController, userSession: userSession, mediaPlayerProvider: MediaPlayerProvider(), - voiceMessageMediaManager: userSession.voiceMessageMediaManager, appMediator: flowParameters.appMediator, appSettings: flowParameters.appSettings, analytics: flowParameters.analytics, diff --git a/ElementX/Sources/FlowCoordinators/PinnedEventsTimelineFlowCoordinator.swift b/ElementX/Sources/FlowCoordinators/PinnedEventsTimelineFlowCoordinator.swift index eb955ee64..1418d15d3 100644 --- a/ElementX/Sources/FlowCoordinators/PinnedEventsTimelineFlowCoordinator.swift +++ b/ElementX/Sources/FlowCoordinators/PinnedEventsTimelineFlowCoordinator.swift @@ -65,7 +65,6 @@ class PinnedEventsTimelineFlowCoordinator: FlowCoordinatorProtocol { timelineController: timelineController, userSession: userSession, mediaPlayerProvider: MediaPlayerProvider(), - voiceMessageMediaManager: userSession.voiceMessageMediaManager, appMediator: flowParameters.appMediator, appSettings: flowParameters.appSettings, analytics: flowParameters.analytics, diff --git a/ElementX/Sources/FlowCoordinators/RoomFlowCoordinator.swift b/ElementX/Sources/FlowCoordinators/RoomFlowCoordinator.swift index cc1612a44..7089164ca 100644 --- a/ElementX/Sources/FlowCoordinators/RoomFlowCoordinator.swift +++ b/ElementX/Sources/FlowCoordinators/RoomFlowCoordinator.swift @@ -550,7 +550,6 @@ class RoomFlowCoordinator: FlowCoordinatorProtocol { sharedText: presentationAction?.sharedText, timelineController: timelineController, mediaPlayerProvider: MediaPlayerProvider(), - voiceMessageMediaManager: userSession.voiceMessageMediaManager, emojiProvider: flowParameters.emojiProvider, completionSuggestionService: completionSuggestionService, ongoingCallRoomIDPublisher: flowParameters.ongoingCallRoomIDPublisher, @@ -647,7 +646,6 @@ class RoomFlowCoordinator: FlowCoordinatorProtocol { roomProxy: roomProxy, timelineController: timelineController, mediaPlayerProvider: MediaPlayerProvider(), - voiceMessageMediaManager: userSession.voiceMessageMediaManager, emojiProvider: flowParameters.emojiProvider, completionSuggestionService: completionSuggestionService, appMediator: flowParameters.appMediator, diff --git a/ElementX/Sources/Screens/MediaEventsTimelineScreen/MediaEventsTimelineScreenCoordinator.swift b/ElementX/Sources/Screens/MediaEventsTimelineScreen/MediaEventsTimelineScreenCoordinator.swift index 5e7834f5c..b8becdae1 100644 --- a/ElementX/Sources/Screens/MediaEventsTimelineScreen/MediaEventsTimelineScreenCoordinator.swift +++ b/ElementX/Sources/Screens/MediaEventsTimelineScreen/MediaEventsTimelineScreenCoordinator.swift @@ -14,7 +14,6 @@ struct MediaEventsTimelineScreenCoordinatorParameters { let filesTimelineController: TimelineControllerProtocol let userSession: UserSessionProtocol let mediaPlayerProvider: MediaPlayerProviderProtocol - let voiceMessageMediaManager: VoiceMessageMediaManagerProtocol let appMediator: AppMediatorProtocol let appSettings: AppSettings let analytics: AnalyticsService @@ -45,7 +44,6 @@ final class MediaEventsTimelineScreenCoordinator: CoordinatorProtocol { timelineController: parameters.mediaTimelineController, userSession: parameters.userSession, mediaPlayerProvider: parameters.mediaPlayerProvider, - voiceMessageMediaManager: parameters.voiceMessageMediaManager, userIndicatorController: parameters.userIndicatorController, appMediator: parameters.appMediator, appSettings: parameters.appSettings, @@ -57,7 +55,6 @@ final class MediaEventsTimelineScreenCoordinator: CoordinatorProtocol { timelineController: parameters.filesTimelineController, userSession: parameters.userSession, mediaPlayerProvider: parameters.mediaPlayerProvider, - voiceMessageMediaManager: parameters.voiceMessageMediaManager, userIndicatorController: parameters.userIndicatorController, appMediator: parameters.appMediator, appSettings: parameters.appSettings, diff --git a/ElementX/Sources/Screens/MediaEventsTimelineScreen/View/MediaEventsTimelineScreen.swift b/ElementX/Sources/Screens/MediaEventsTimelineScreen/View/MediaEventsTimelineScreen.swift index ef771bf83..0919bacdf 100644 --- a/ElementX/Sources/Screens/MediaEventsTimelineScreen/View/MediaEventsTimelineScreen.swift +++ b/ElementX/Sources/Screens/MediaEventsTimelineScreen/View/MediaEventsTimelineScreen.swift @@ -276,7 +276,6 @@ struct MediaEventsTimelineScreen_Previews: PreviewProvider, TestablePreview { timelineController: timelineController, userSession: UserSessionMock(.init()), mediaPlayerProvider: MediaPlayerProviderMock(), - voiceMessageMediaManager: VoiceMessageMediaManagerMock(), userIndicatorController: UserIndicatorControllerMock(), appMediator: AppMediatorMock.default, appSettings: ServiceLocator.shared.settings, diff --git a/ElementX/Sources/Screens/PinnedEventsTimelineScreen/PinnedEventsTimelineScreenCoordinator.swift b/ElementX/Sources/Screens/PinnedEventsTimelineScreen/PinnedEventsTimelineScreenCoordinator.swift index 3dedf9bc5..7d97d4760 100644 --- a/ElementX/Sources/Screens/PinnedEventsTimelineScreen/PinnedEventsTimelineScreenCoordinator.swift +++ b/ElementX/Sources/Screens/PinnedEventsTimelineScreen/PinnedEventsTimelineScreenCoordinator.swift @@ -13,7 +13,6 @@ struct PinnedEventsTimelineScreenCoordinatorParameters { let timelineController: TimelineControllerProtocol let userSession: UserSessionProtocol let mediaPlayerProvider: MediaPlayerProviderProtocol - let voiceMessageMediaManager: VoiceMessageMediaManagerProtocol let appMediator: AppMediatorProtocol let appSettings: AppSettings let analytics: AnalyticsService @@ -50,7 +49,6 @@ final class PinnedEventsTimelineScreenCoordinator: CoordinatorProtocol { timelineController: parameters.timelineController, userSession: parameters.userSession, mediaPlayerProvider: parameters.mediaPlayerProvider, - voiceMessageMediaManager: parameters.voiceMessageMediaManager, userIndicatorController: parameters.userIndicatorController, appMediator: parameters.appMediator, appSettings: parameters.appSettings, diff --git a/ElementX/Sources/Screens/PinnedEventsTimelineScreen/View/PinnedEventsTimelineScreen.swift b/ElementX/Sources/Screens/PinnedEventsTimelineScreen/View/PinnedEventsTimelineScreen.swift index 27866ea9a..54df3cee5 100644 --- a/ElementX/Sources/Screens/PinnedEventsTimelineScreen/View/PinnedEventsTimelineScreen.swift +++ b/ElementX/Sources/Screens/PinnedEventsTimelineScreen/View/PinnedEventsTimelineScreen.swift @@ -73,7 +73,6 @@ struct PinnedEventsTimelineScreen_Previews: PreviewProvider, TestablePreview { timelineController: timelineController, userSession: UserSessionMock(.init()), mediaPlayerProvider: MediaPlayerProviderMock(), - voiceMessageMediaManager: VoiceMessageMediaManagerMock(), userIndicatorController: UserIndicatorControllerMock(), appMediator: AppMediatorMock.default, appSettings: ServiceLocator.shared.settings, diff --git a/ElementX/Sources/Screens/RoomScreen/RoomScreenCoordinator.swift b/ElementX/Sources/Screens/RoomScreen/RoomScreenCoordinator.swift index 917ec71f3..51f614f29 100644 --- a/ElementX/Sources/Screens/RoomScreen/RoomScreenCoordinator.swift +++ b/ElementX/Sources/Screens/RoomScreen/RoomScreenCoordinator.swift @@ -18,7 +18,6 @@ struct RoomScreenCoordinatorParameters { var sharedText: String? let timelineController: TimelineControllerProtocol let mediaPlayerProvider: MediaPlayerProviderProtocol - let voiceMessageMediaManager: VoiceMessageMediaManagerProtocol let emojiProvider: EmojiProviderProtocol let completionSuggestionService: CompletionSuggestionServiceProtocol let ongoingCallRoomIDPublisher: CurrentValuePublisher @@ -83,7 +82,6 @@ final class RoomScreenCoordinator: CoordinatorProtocol { timelineController: parameters.timelineController, userSession: parameters.userSession, mediaPlayerProvider: parameters.mediaPlayerProvider, - voiceMessageMediaManager: parameters.voiceMessageMediaManager, userIndicatorController: parameters.userIndicatorController, appMediator: parameters.appMediator, appSettings: parameters.appSettings, diff --git a/ElementX/Sources/Screens/RoomScreen/View/RoomScreen.swift b/ElementX/Sources/Screens/RoomScreen/View/RoomScreen.swift index a497a6f08..9c80eba9e 100644 --- a/ElementX/Sources/Screens/RoomScreen/View/RoomScreen.swift +++ b/ElementX/Sources/Screens/RoomScreen/View/RoomScreen.swift @@ -259,7 +259,6 @@ struct RoomScreen_Previews: PreviewProvider, TestablePreview { timelineController: MockTimelineController(), userSession: UserSessionMock(.init()), mediaPlayerProvider: MediaPlayerProviderMock(), - voiceMessageMediaManager: VoiceMessageMediaManagerMock(), userIndicatorController: ServiceLocator.shared.userIndicatorController, appMediator: AppMediatorMock.default, appSettings: ServiceLocator.shared.settings, diff --git a/ElementX/Sources/Screens/ThreadTimelineScreen/ThreadTimelineScreenCoordinator.swift b/ElementX/Sources/Screens/ThreadTimelineScreen/ThreadTimelineScreenCoordinator.swift index 352bbdf47..4f698a3f3 100644 --- a/ElementX/Sources/Screens/ThreadTimelineScreen/ThreadTimelineScreenCoordinator.swift +++ b/ElementX/Sources/Screens/ThreadTimelineScreen/ThreadTimelineScreenCoordinator.swift @@ -15,7 +15,6 @@ struct ThreadTimelineScreenCoordinatorParameters { let roomProxy: JoinedRoomProxyProtocol let timelineController: TimelineControllerProtocol let mediaPlayerProvider: MediaPlayerProviderProtocol - let voiceMessageMediaManager: VoiceMessageMediaManagerProtocol let emojiProvider: EmojiProviderProtocol let completionSuggestionService: CompletionSuggestionServiceProtocol let appMediator: AppMediatorProtocol @@ -61,7 +60,6 @@ final class ThreadTimelineScreenCoordinator: CoordinatorProtocol { timelineController: parameters.timelineController, userSession: parameters.userSession, mediaPlayerProvider: parameters.mediaPlayerProvider, - voiceMessageMediaManager: parameters.voiceMessageMediaManager, userIndicatorController: parameters.userIndicatorController, appMediator: parameters.appMediator, appSettings: parameters.appSettings, diff --git a/ElementX/Sources/Screens/Timeline/TimelineInteractionHandler.swift b/ElementX/Sources/Screens/Timeline/TimelineInteractionHandler.swift index 2dbab08c0..c074a419e 100644 --- a/ElementX/Sources/Screens/Timeline/TimelineInteractionHandler.swift +++ b/ElementX/Sources/Screens/Timeline/TimelineInteractionHandler.swift @@ -36,7 +36,6 @@ class TimelineInteractionHandler { private let userSession: UserSessionProtocol private let mediaPlayerProvider: MediaPlayerProviderProtocol private let voiceMessageRecorder: VoiceMessageRecorderProtocol - private let voiceMessageMediaManager: VoiceMessageMediaManagerProtocol private let userIndicatorController: UserIndicatorControllerProtocol private let appMediator: AppMediatorProtocol private let appSettings: AppSettings @@ -62,7 +61,6 @@ class TimelineInteractionHandler { timelineController: TimelineControllerProtocol, userSession: UserSessionProtocol, mediaPlayerProvider: MediaPlayerProviderProtocol, - voiceMessageMediaManager: VoiceMessageMediaManagerProtocol, voiceMessageRecorder: VoiceMessageRecorderProtocol, userIndicatorController: UserIndicatorControllerProtocol, appMediator: AppMediatorProtocol, @@ -74,7 +72,6 @@ class TimelineInteractionHandler { self.timelineController = timelineController self.userSession = userSession self.mediaPlayerProvider = mediaPlayerProvider - self.voiceMessageMediaManager = voiceMessageMediaManager self.voiceMessageRecorder = voiceMessageRecorder self.userIndicatorController = userIndicatorController self.appMediator = appMediator @@ -451,7 +448,7 @@ class TimelineInteractionHandler { // Load content do { MXLog.info("Loading voice message audio content from source for itemID \(itemID)") - let url = try await voiceMessageMediaManager.loadVoiceMessageFromSource(source, body: nil) + let url = try await userSession.voiceMessageMediaManager.loadVoiceMessageFromSource(source, body: nil) // Make sure that the player is still attached, as it may have been detached while waiting for the voice message to be loaded. if audioPlayerState.isAttached { @@ -588,7 +585,6 @@ class TimelineInteractionHandler { timelineController: timelineController, userSession: userSession, mediaPlayerProvider: mediaPlayerProvider, - voiceMessageMediaManager: voiceMessageMediaManager, userIndicatorController: userIndicatorController, appMediator: appMediator, appSettings: appSettings, diff --git a/ElementX/Sources/Screens/Timeline/TimelineViewModel.swift b/ElementX/Sources/Screens/Timeline/TimelineViewModel.swift index 213ca59b2..84634ec68 100644 --- a/ElementX/Sources/Screens/Timeline/TimelineViewModel.swift +++ b/ElementX/Sources/Screens/Timeline/TimelineViewModel.swift @@ -51,7 +51,6 @@ class TimelineViewModel: TimelineViewModelType, TimelineViewModelProtocol { timelineController: TimelineControllerProtocol, userSession: UserSessionProtocol, mediaPlayerProvider: MediaPlayerProviderProtocol, - voiceMessageMediaManager: VoiceMessageMediaManagerProtocol, userIndicatorController: UserIndicatorControllerProtocol, appMediator: AppMediatorProtocol, appSettings: AppSettings, @@ -75,7 +74,6 @@ class TimelineViewModel: TimelineViewModelType, TimelineViewModelProtocol { timelineController: timelineController, userSession: userSession, mediaPlayerProvider: mediaPlayerProvider, - voiceMessageMediaManager: voiceMessageMediaManager, voiceMessageRecorder: voiceMessageRecorder, userIndicatorController: userIndicatorController, appMediator: appMediator, @@ -1001,7 +999,6 @@ extension TimelineViewModel { timelineController: timelineController ?? MockTimelineController(timelineKind: timelineKind), userSession: UserSessionMock(.init(clientProxy: clientProxyMock)), mediaPlayerProvider: MediaPlayerProviderMock(), - voiceMessageMediaManager: VoiceMessageMediaManagerMock(), userIndicatorController: ServiceLocator.shared.userIndicatorController, appMediator: AppMediatorMock.default, appSettings: ServiceLocator.shared.settings, diff --git a/ElementX/Sources/Screens/Timeline/View/ReadReceipts/ReadReceiptsSummaryView.swift b/ElementX/Sources/Screens/Timeline/View/ReadReceipts/ReadReceiptsSummaryView.swift index a5daa3139..761d2051a 100644 --- a/ElementX/Sources/Screens/Timeline/View/ReadReceipts/ReadReceiptsSummaryView.swift +++ b/ElementX/Sources/Screens/Timeline/View/ReadReceipts/ReadReceiptsSummaryView.swift @@ -47,7 +47,6 @@ struct ReadReceiptsSummaryView_Previews: PreviewProvider, TestablePreview { timelineController: MockTimelineController(), userSession: UserSessionMock(.init()), mediaPlayerProvider: MediaPlayerProviderMock(), - voiceMessageMediaManager: VoiceMessageMediaManagerMock(), userIndicatorController: UserIndicatorControllerMock(), appMediator: AppMediatorMock.default, appSettings: ServiceLocator.shared.settings, diff --git a/ElementX/Sources/Screens/Timeline/View/Style/TimelineItemBubbledStylerView.swift b/ElementX/Sources/Screens/Timeline/View/Style/TimelineItemBubbledStylerView.swift index af7216011..b34667488 100644 --- a/ElementX/Sources/Screens/Timeline/View/Style/TimelineItemBubbledStylerView.swift +++ b/ElementX/Sources/Screens/Timeline/View/Style/TimelineItemBubbledStylerView.swift @@ -336,7 +336,6 @@ struct TimelineItemBubbledStylerView_Previews: PreviewProvider, TestablePreview timelineController: MockTimelineController(), userSession: UserSessionMock(.init()), mediaPlayerProvider: MediaPlayerProviderMock(), - voiceMessageMediaManager: VoiceMessageMediaManagerMock(), userIndicatorController: ServiceLocator.shared.userIndicatorController, appMediator: AppMediatorMock.default, appSettings: ServiceLocator.shared.settings, diff --git a/ElementX/Sources/Screens/Timeline/View/Supplementary/TimelineReadReceiptsView.swift b/ElementX/Sources/Screens/Timeline/View/Supplementary/TimelineReadReceiptsView.swift index 59094e994..1f12b599a 100644 --- a/ElementX/Sources/Screens/Timeline/View/Supplementary/TimelineReadReceiptsView.swift +++ b/ElementX/Sources/Screens/Timeline/View/Supplementary/TimelineReadReceiptsView.swift @@ -82,7 +82,6 @@ struct TimelineReadReceiptsView_Previews: PreviewProvider, TestablePreview { timelineController: MockTimelineController(), userSession: UserSessionMock(.init()), mediaPlayerProvider: MediaPlayerProviderMock(), - voiceMessageMediaManager: VoiceMessageMediaManagerMock(), userIndicatorController: ServiceLocator.shared.userIndicatorController, appMediator: AppMediatorMock.default, appSettings: ServiceLocator.shared.settings, diff --git a/ElementX/Sources/Screens/Timeline/View/TimelineItemViews/HighlightedTimelineItemModifier.swift b/ElementX/Sources/Screens/Timeline/View/TimelineItemViews/HighlightedTimelineItemModifier.swift index f6c8d0185..b640951bd 100644 --- a/ElementX/Sources/Screens/Timeline/View/TimelineItemViews/HighlightedTimelineItemModifier.swift +++ b/ElementX/Sources/Screens/Timeline/View/TimelineItemViews/HighlightedTimelineItemModifier.swift @@ -92,7 +92,6 @@ struct HighlightedTimelineItemTimeline_Previews: PreviewProvider { timelineController: MockTimelineController(), userSession: UserSessionMock(.init()), mediaPlayerProvider: MediaPlayerProviderMock(), - voiceMessageMediaManager: VoiceMessageMediaManagerMock(), userIndicatorController: ServiceLocator.shared.userIndicatorController, appMediator: AppMediatorMock.default, appSettings: ServiceLocator.shared.settings, diff --git a/ElementX/Sources/Screens/Timeline/View/TimelineView.swift b/ElementX/Sources/Screens/Timeline/View/TimelineView.swift index 4c3868a31..d16f5359c 100644 --- a/ElementX/Sources/Screens/Timeline/View/TimelineView.swift +++ b/ElementX/Sources/Screens/Timeline/View/TimelineView.swift @@ -144,7 +144,6 @@ struct TimelineView_Previews: PreviewProvider, TestablePreview { timelineController: MockTimelineController(), userSession: UserSessionMock(.init()), mediaPlayerProvider: MediaPlayerProviderMock(), - voiceMessageMediaManager: VoiceMessageMediaManagerMock(), userIndicatorController: ServiceLocator.shared.userIndicatorController, appMediator: AppMediatorMock.default, appSettings: ServiceLocator.shared.settings, diff --git a/ElementX/Sources/UITests/UITestsAppCoordinator.swift b/ElementX/Sources/UITests/UITestsAppCoordinator.swift index 9d7545314..01001fd7a 100644 --- a/ElementX/Sources/UITests/UITestsAppCoordinator.swift +++ b/ElementX/Sources/UITests/UITestsAppCoordinator.swift @@ -263,7 +263,6 @@ class MockScreen: Identifiable { roomProxy: JoinedRoomProxyMock(.init(name: "Some room name", avatarURL: nil)), timelineController: MockTimelineController(), mediaPlayerProvider: MediaPlayerProviderMock(), - voiceMessageMediaManager: VoiceMessageMediaManagerMock(), emojiProvider: EmojiProvider(appSettings: ServiceLocator.shared.settings), completionSuggestionService: CompletionSuggestionServiceMock(configuration: .init()), ongoingCallRoomIDPublisher: .init(.init(nil)), @@ -285,7 +284,6 @@ class MockScreen: Identifiable { roomProxy: JoinedRoomProxyMock(.init(name: "New room", avatarURL: .mockMXCAvatar)), timelineController: timelineController, mediaPlayerProvider: MediaPlayerProviderMock(), - voiceMessageMediaManager: VoiceMessageMediaManagerMock(), emojiProvider: EmojiProvider(appSettings: ServiceLocator.shared.settings), completionSuggestionService: CompletionSuggestionServiceMock(configuration: .init()), ongoingCallRoomIDPublisher: .init(.init(nil)), @@ -307,7 +305,6 @@ class MockScreen: Identifiable { roomProxy: JoinedRoomProxyMock(.init(name: "New room", avatarURL: .mockMXCAvatar)), timelineController: timelineController, mediaPlayerProvider: MediaPlayerProviderMock(), - voiceMessageMediaManager: VoiceMessageMediaManagerMock(), emojiProvider: EmojiProvider(appSettings: ServiceLocator.shared.settings), completionSuggestionService: CompletionSuggestionServiceMock(configuration: .init()), ongoingCallRoomIDPublisher: .init(.init(nil)), @@ -328,7 +325,6 @@ class MockScreen: Identifiable { roomProxy: JoinedRoomProxyMock(.init(name: "New room", avatarURL: .mockMXCAvatar)), timelineController: timelineController, mediaPlayerProvider: MediaPlayerProviderMock(), - voiceMessageMediaManager: VoiceMessageMediaManagerMock(), emojiProvider: EmojiProvider(appSettings: ServiceLocator.shared.settings), completionSuggestionService: CompletionSuggestionServiceMock(configuration: .init()), ongoingCallRoomIDPublisher: .init(.init(nil)), @@ -352,7 +348,6 @@ class MockScreen: Identifiable { roomProxy: JoinedRoomProxyMock(.init(name: "Small timeline", avatarURL: .mockMXCAvatar)), timelineController: timelineController, mediaPlayerProvider: MediaPlayerProviderMock(), - voiceMessageMediaManager: VoiceMessageMediaManagerMock(), emojiProvider: EmojiProvider(appSettings: ServiceLocator.shared.settings), completionSuggestionService: CompletionSuggestionServiceMock(configuration: .init()), ongoingCallRoomIDPublisher: .init(.init(nil)), @@ -376,7 +371,6 @@ class MockScreen: Identifiable { roomProxy: JoinedRoomProxyMock(.init(name: "Small timeline, paginating", avatarURL: .mockMXCAvatar)), timelineController: timelineController, mediaPlayerProvider: MediaPlayerProviderMock(), - voiceMessageMediaManager: VoiceMessageMediaManagerMock(), emojiProvider: EmojiProvider(appSettings: ServiceLocator.shared.settings), completionSuggestionService: CompletionSuggestionServiceMock(configuration: .init()), ongoingCallRoomIDPublisher: .init(.init(nil)), @@ -399,7 +393,6 @@ class MockScreen: Identifiable { roomProxy: JoinedRoomProxyMock(.init(name: "Large timeline", avatarURL: .mockMXCAvatar)), timelineController: timelineController, mediaPlayerProvider: MediaPlayerProviderMock(), - voiceMessageMediaManager: VoiceMessageMediaManagerMock(), emojiProvider: EmojiProvider(appSettings: ServiceLocator.shared.settings), completionSuggestionService: CompletionSuggestionServiceMock(configuration: .init()), ongoingCallRoomIDPublisher: .init(.init(nil)), @@ -424,7 +417,6 @@ class MockScreen: Identifiable { roomProxy: JoinedRoomProxyMock(.init(name: "Large timeline", avatarURL: .mockMXCAvatar)), timelineController: timelineController, mediaPlayerProvider: MediaPlayerProviderMock(), - voiceMessageMediaManager: VoiceMessageMediaManagerMock(), emojiProvider: EmojiProvider(appSettings: ServiceLocator.shared.settings), completionSuggestionService: CompletionSuggestionServiceMock(configuration: .init()), ongoingCallRoomIDPublisher: .init(.init(nil)), @@ -448,7 +440,6 @@ class MockScreen: Identifiable { roomProxy: JoinedRoomProxyMock(.init(name: "Large timeline", avatarURL: .mockMXCAvatar)), timelineController: timelineController, mediaPlayerProvider: MediaPlayerProviderMock(), - voiceMessageMediaManager: VoiceMessageMediaManagerMock(), emojiProvider: EmojiProvider(appSettings: ServiceLocator.shared.settings), completionSuggestionService: CompletionSuggestionServiceMock(configuration: .init()), ongoingCallRoomIDPublisher: .init(.init(nil)), @@ -471,7 +462,6 @@ class MockScreen: Identifiable { roomProxy: JoinedRoomProxyMock(.init(name: "Timeline highlight", avatarURL: .mockMXCAvatar)), timelineController: timelineController, mediaPlayerProvider: MediaPlayerProviderMock(), - voiceMessageMediaManager: VoiceMessageMediaManagerMock(), emojiProvider: EmojiProvider(appSettings: ServiceLocator.shared.settings), completionSuggestionService: CompletionSuggestionServiceMock(configuration: .init()), ongoingCallRoomIDPublisher: .init(.init(nil)), @@ -508,7 +498,6 @@ class MockScreen: Identifiable { roomProxy: JoinedRoomProxyMock(.init(name: "Polls timeline", avatarURL: .mockMXCAvatar)), timelineController: timelineController, mediaPlayerProvider: MediaPlayerProviderMock(), - voiceMessageMediaManager: VoiceMessageMediaManagerMock(), emojiProvider: EmojiProvider(appSettings: ServiceLocator.shared.settings), completionSuggestionService: CompletionSuggestionServiceMock(configuration: .init()), ongoingCallRoomIDPublisher: .init(.init(nil)), @@ -532,7 +521,6 @@ class MockScreen: Identifiable { roomProxy: JoinedRoomProxyMock(.init(name: "Polls timeline", avatarURL: .mockMXCAvatar)), timelineController: timelineController, mediaPlayerProvider: MediaPlayerProviderMock(), - voiceMessageMediaManager: VoiceMessageMediaManagerMock(), emojiProvider: EmojiProvider(appSettings: ServiceLocator.shared.settings), completionSuggestionService: CompletionSuggestionServiceMock(configuration: .init()), ongoingCallRoomIDPublisher: .init(.init(nil)), @@ -556,7 +544,6 @@ class MockScreen: Identifiable { roomProxy: JoinedRoomProxyMock(.init(name: "Polls timeline", avatarURL: .mockMXCAvatar)), timelineController: timelineController, mediaPlayerProvider: MediaPlayerProviderMock(), - voiceMessageMediaManager: VoiceMessageMediaManagerMock(), emojiProvider: EmojiProvider(appSettings: ServiceLocator.shared.settings), completionSuggestionService: CompletionSuggestionServiceMock(configuration: .init()), ongoingCallRoomIDPublisher: .init(.init(nil)), diff --git a/UnitTests/Sources/PillContextTests.swift b/UnitTests/Sources/PillContextTests.swift index ccdf8c76e..ed28741ca 100644 --- a/UnitTests/Sources/PillContextTests.swift +++ b/UnitTests/Sources/PillContextTests.swift @@ -21,7 +21,6 @@ class PillContextTests: XCTestCase { timelineController: MockTimelineController(), userSession: UserSessionMock(.init()), mediaPlayerProvider: MediaPlayerProviderMock(), - voiceMessageMediaManager: VoiceMessageMediaManagerMock(), userIndicatorController: ServiceLocator.shared.userIndicatorController, appMediator: AppMediatorMock.default, appSettings: ServiceLocator.shared.settings, @@ -51,7 +50,6 @@ class PillContextTests: XCTestCase { timelineController: MockTimelineController(), userSession: UserSessionMock(.init()), mediaPlayerProvider: MediaPlayerProviderMock(), - voiceMessageMediaManager: VoiceMessageMediaManagerMock(), userIndicatorController: ServiceLocator.shared.userIndicatorController, appMediator: AppMediatorMock.default, appSettings: ServiceLocator.shared.settings, @@ -74,7 +72,6 @@ class PillContextTests: XCTestCase { timelineController: mockController, userSession: UserSessionMock(.init()), mediaPlayerProvider: MediaPlayerProviderMock(), - voiceMessageMediaManager: VoiceMessageMediaManagerMock(), userIndicatorController: ServiceLocator.shared.userIndicatorController, appMediator: AppMediatorMock.default, appSettings: ServiceLocator.shared.settings, @@ -97,7 +94,6 @@ class PillContextTests: XCTestCase { timelineController: mockController, userSession: UserSessionMock(.init(clientProxy: clientMock)), mediaPlayerProvider: MediaPlayerProviderMock(), - voiceMessageMediaManager: VoiceMessageMediaManagerMock(), userIndicatorController: ServiceLocator.shared.userIndicatorController, appMediator: AppMediatorMock.default, appSettings: ServiceLocator.shared.settings, @@ -119,7 +115,6 @@ class PillContextTests: XCTestCase { timelineController: mockController, userSession: UserSessionMock(.init()), mediaPlayerProvider: MediaPlayerProviderMock(), - voiceMessageMediaManager: VoiceMessageMediaManagerMock(), userIndicatorController: ServiceLocator.shared.userIndicatorController, appMediator: AppMediatorMock.default, appSettings: ServiceLocator.shared.settings, @@ -145,7 +140,6 @@ class PillContextTests: XCTestCase { timelineController: mockController, userSession: UserSessionMock(.init(clientProxy: clientMock)), mediaPlayerProvider: MediaPlayerProviderMock(), - voiceMessageMediaManager: VoiceMessageMediaManagerMock(), userIndicatorController: ServiceLocator.shared.userIndicatorController, appMediator: AppMediatorMock.default, appSettings: ServiceLocator.shared.settings, @@ -167,7 +161,6 @@ class PillContextTests: XCTestCase { timelineController: mockController, userSession: UserSessionMock(.init()), mediaPlayerProvider: MediaPlayerProviderMock(), - voiceMessageMediaManager: VoiceMessageMediaManagerMock(), userIndicatorController: ServiceLocator.shared.userIndicatorController, appMediator: AppMediatorMock.default, appSettings: ServiceLocator.shared.settings, @@ -191,7 +184,6 @@ class PillContextTests: XCTestCase { timelineController: mockController, userSession: UserSessionMock(.init(clientProxy: clientMock)), mediaPlayerProvider: MediaPlayerProviderMock(), - voiceMessageMediaManager: VoiceMessageMediaManagerMock(), userIndicatorController: ServiceLocator.shared.userIndicatorController, appMediator: AppMediatorMock.default, appSettings: ServiceLocator.shared.settings, @@ -213,7 +205,6 @@ class PillContextTests: XCTestCase { timelineController: mockController, userSession: UserSessionMock(.init()), mediaPlayerProvider: MediaPlayerProviderMock(), - voiceMessageMediaManager: VoiceMessageMediaManagerMock(), userIndicatorController: ServiceLocator.shared.userIndicatorController, appMediator: AppMediatorMock.default, appSettings: ServiceLocator.shared.settings, @@ -239,7 +230,6 @@ class PillContextTests: XCTestCase { timelineController: mockController, userSession: UserSessionMock(.init(clientProxy: clientMock)), mediaPlayerProvider: MediaPlayerProviderMock(), - voiceMessageMediaManager: VoiceMessageMediaManagerMock(), userIndicatorController: ServiceLocator.shared.userIndicatorController, appMediator: AppMediatorMock.default, appSettings: ServiceLocator.shared.settings, @@ -261,7 +251,6 @@ class PillContextTests: XCTestCase { timelineController: mockController, userSession: UserSessionMock(.init()), mediaPlayerProvider: MediaPlayerProviderMock(), - voiceMessageMediaManager: VoiceMessageMediaManagerMock(), userIndicatorController: ServiceLocator.shared.userIndicatorController, appMediator: AppMediatorMock.default, appSettings: ServiceLocator.shared.settings, diff --git a/UnitTests/Sources/TimelineViewModelTests.swift b/UnitTests/Sources/TimelineViewModelTests.swift index 7823a1608..9148eb81e 100644 --- a/UnitTests/Sources/TimelineViewModelTests.swift +++ b/UnitTests/Sources/TimelineViewModelTests.swift @@ -306,7 +306,6 @@ class TimelineViewModelTests: XCTestCase { timelineController: timelineController, userSession: UserSessionMock(.init()), mediaPlayerProvider: MediaPlayerProviderMock(), - voiceMessageMediaManager: VoiceMessageMediaManagerMock(), userIndicatorController: userIndicatorControllerMock, appMediator: AppMediatorMock.default, appSettings: ServiceLocator.shared.settings, @@ -332,7 +331,6 @@ class TimelineViewModelTests: XCTestCase { timelineController: timelineController, userSession: UserSessionMock(.init()), mediaPlayerProvider: MediaPlayerProviderMock(), - voiceMessageMediaManager: VoiceMessageMediaManagerMock(), userIndicatorController: userIndicatorControllerMock, appMediator: AppMediatorMock.default, appSettings: ServiceLocator.shared.settings, @@ -356,7 +354,6 @@ class TimelineViewModelTests: XCTestCase { timelineController: MockTimelineController(), userSession: UserSessionMock(.init()), mediaPlayerProvider: MediaPlayerProviderMock(), - voiceMessageMediaManager: VoiceMessageMediaManagerMock(), userIndicatorController: userIndicatorControllerMock, appMediator: AppMediatorMock.default, appSettings: ServiceLocator.shared.settings, @@ -392,7 +389,6 @@ class TimelineViewModelTests: XCTestCase { timelineController: MockTimelineController(), userSession: UserSessionMock(.init()), mediaPlayerProvider: MediaPlayerProviderMock(), - voiceMessageMediaManager: VoiceMessageMediaManagerMock(), userIndicatorController: userIndicatorControllerMock, appMediator: AppMediatorMock.default, appSettings: ServiceLocator.shared.settings, @@ -428,7 +424,6 @@ class TimelineViewModelTests: XCTestCase { timelineController: MockTimelineController(), userSession: UserSessionMock(.init()), mediaPlayerProvider: MediaPlayerProviderMock(), - voiceMessageMediaManager: VoiceMessageMediaManagerMock(), userIndicatorController: userIndicatorControllerMock, appMediator: AppMediatorMock.default, appSettings: ServiceLocator.shared.settings, @@ -470,7 +465,6 @@ class TimelineViewModelTests: XCTestCase { timelineController: MockTimelineController(), userSession: UserSessionMock(.init()), mediaPlayerProvider: MediaPlayerProviderMock(), - voiceMessageMediaManager: VoiceMessageMediaManagerMock(), userIndicatorController: userIndicatorControllerMock, appMediator: AppMediatorMock.default, appSettings: ServiceLocator.shared.settings, @@ -498,7 +492,6 @@ class TimelineViewModelTests: XCTestCase { timelineController: MockTimelineController(), userSession: UserSessionMock(.init()), mediaPlayerProvider: MediaPlayerProviderMock(), - voiceMessageMediaManager: VoiceMessageMediaManagerMock(), userIndicatorController: userIndicatorControllerMock, appMediator: AppMediatorMock.default, appSettings: ServiceLocator.shared.settings, @@ -536,7 +529,6 @@ class TimelineViewModelTests: XCTestCase { timelineController: timelineController, userSession: UserSessionMock(.init()), mediaPlayerProvider: MediaPlayerProviderMock(), - voiceMessageMediaManager: VoiceMessageMediaManagerMock(), userIndicatorController: userIndicatorControllerMock, appMediator: AppMediatorMock.default, appSettings: ServiceLocator.shared.settings,