ehealthsolutions/element-x-ios
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/element-x-ios.git synced 2026-11-03 06:55:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix a crash in the media events screen by storing the active timeline context. (#3746)

Browse Source
This commit is contained in:
Doug
2025-02-06 12:27:39 +00:00
committed by GitHub
parent 922ebf47e6
commit b900eec5a2
3 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ElementX/Sources/Screens/MediaEventsTimelineScreen/MediaEventsTimelineScreenViewModel.swift
+17 -7
View File
@@ -37,7 +37,7 @@ class MediaEventsTimelineScreenViewModel: MediaEventsTimelineScreenViewModelType
init(mediaTimelineViewModel: TimelineViewModelProtocol,
filesTimelineViewModel: TimelineViewModelProtocol,
initialViewState: MediaEventsTimelineScreenViewState = .init(bindings: .init(screenMode: .media)),
initialScreenMode: MediaEventsTimelineScreenMode = .media,
mediaProvider: MediaProviderProtocol,
userIndicatorController: UserIndicatorControllerProtocol,
appMediator: AppMediatorProtocol) {
@@ -47,14 +47,24 @@ class MediaEventsTimelineScreenViewModel: MediaEventsTimelineScreenViewModelType
self.userIndicatorController = userIndicatorController
self.appMediator = appMediator
super.init(initialViewState: initialViewState, mediaProvider: mediaProvider)
state.activeTimelineContextProvider = { [weak self] in
guard let self else { fatalError() }
return activeTimelineViewModel.context
let activeTimelineContext = switch initialScreenMode {
case .media: mediaTimelineViewModel.context
case .files: filesTimelineViewModel.context
}
super.init(initialViewState: .init(activeTimelineContext: activeTimelineContext, bindings: .init(screenMode: initialScreenMode)), mediaProvider: mediaProvider)
context.$viewState.map(\.bindings.screenMode)
.removeDuplicates()
.map {
switch $0 {
case .media: mediaTimelineViewModel.context
case .files: filesTimelineViewModel.context
}
}
.weakAssign(to: \.state.activeTimelineContext, on: self)
.store(in: &cancellables)
mediaTimelineViewModel.context.$viewState.sink { [weak self] timelineViewState in
guard let self, state.bindings.screenMode == .media else {
return