ehealthsolutions/element-x-ios
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/element-x-ios.git synced 2026-11-04 10:33:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update the SDK and handle breaking changes. (#2527)

Browse Source
This commit is contained in:
Doug
2024-03-05 14:08:34 +00:00
committed by GitHub
parent 4320e5c9e0
commit 1b5db6c63d
39 changed files with 455 additions and 504 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ElementX/Sources/Screens/ReportContentScreen/ReportContentScreenCoordinator.swift
+7 -3
View File
@@ -21,6 +21,7 @@ struct ReportContentScreenCoordinatorParameters {
let eventID: String
let senderID: String
let roomProxy: RoomProxyProtocol
let clientProxy: ClientProxyProtocol
let userIndicatorController: UserIndicatorControllerProtocol
}
@@ -42,7 +43,10 @@ final class ReportContentScreenCoordinator: CoordinatorProtocol {
init(parameters: ReportContentScreenCoordinatorParameters) {
self.parameters = parameters
viewModel = ReportContentScreenViewModel(eventID: parameters.eventID, senderID: parameters.senderID, roomProxy: parameters.roomProxy)
viewModel = ReportContentScreenViewModel(eventID: parameters.eventID,
senderID: parameters.senderID,
roomProxy: parameters.roomProxy,
clientProxy: parameters.clientProxy)
}
// MARK: - Public
@@ -55,9 +59,9 @@ final class ReportContentScreenCoordinator: CoordinatorProtocol {
switch action {
case .submitStarted:
startLoading()
case let .submitFailed(error):
case let .submitFailed(message):
stopLoading()
showError(description: error.localizedDescription)
showError(description: message)
case .submitFinished:
stopLoading()
actionsSubject.send(.finish)
ElementX/Sources/Screens/ReportContentScreen/ReportContentScreenModels.swift
+1 -1
View File
@@ -20,7 +20,7 @@ enum ReportContentScreenViewModelAction: Equatable {
case cancel
case submitStarted
case submitFinished
case submitFailed(error: RoomProxyError)
case submitFailed(message: String)
}
struct ReportContentScreenViewState: BindableState {
ElementX/Sources/Screens/ReportContentScreen/ReportContentScreenViewModel.swift
+6 -4
View File
@@ -23,16 +23,18 @@ class ReportContentScreenViewModel: ReportContentScreenViewModelType, ReportCont
private let eventID: String
private let senderID: String
private let roomProxy: RoomProxyProtocol
private let clientProxy: ClientProxyProtocol
private let actionsSubject: PassthroughSubject<ReportContentScreenViewModelAction, Never> = .init()
var actions: AnyPublisher<ReportContentScreenViewModelAction, Never> {
actionsSubject.eraseToAnyPublisher()
}
init(eventID: String, senderID: String, roomProxy: RoomProxyProtocol) {
init(eventID: String, senderID: String, roomProxy: RoomProxyProtocol, clientProxy: ClientProxyProtocol) {
self.eventID = eventID
self.senderID = senderID
self.roomProxy = roomProxy
self.clientProxy = clientProxy
super.init(initialViewState: ReportContentScreenViewState(bindings: ReportContentScreenViewStateBindings(reasonText: "", ignoreUser: false)))
}
@@ -55,14 +57,14 @@ class ReportContentScreenViewModel: ReportContentScreenViewModelType, ReportCont
if case let .failure(error) = await roomProxy.reportContent(eventID, reason: state.bindings.reasonText) {
MXLog.error("Submit Report Content failed: \(error)")
actionsSubject.send(.submitFailed(error: error))
actionsSubject.send(.submitFailed(message: error.localizedDescription))
return
}
// Ignore the sender if the user wants to.
if state.bindings.ignoreUser, case let .failure(error) = await roomProxy.ignoreUser(senderID) {
if state.bindings.ignoreUser, case let .failure(error) = await clientProxy.ignoreUser(senderID) {
MXLog.error("Ignore user failed: \(error)")
actionsSubject.send(.submitFailed(error: error))
actionsSubject.send(.submitFailed(message: error.localizedDescription))
return
}
ElementX/Sources/Screens/ReportContentScreen/View/ReportContentScreen.swift
+2 -1
View File
@@ -77,7 +77,8 @@ struct ReportContentScreen: View {
struct ReportContentScreen_Previews: PreviewProvider, TestablePreview {
static let viewModel = ReportContentScreenViewModel(eventID: "",
senderID: "",
roomProxy: RoomProxyMock(with: .init()))
roomProxy: RoomProxyMock(with: .init()),
clientProxy: ClientProxyMock(.init()))
static var previews: some View {
NavigationStack {