mirror of
https://github.com/Novaloop-AG/element-x-ios.git
synced 2026-11-05 20:09:04 +00:00
Fixes #2414 - Move member loading to the room member detail screen, avoid blocking the whole application
This commit is contained in:
@@ -31,6 +31,7 @@ struct Application: App {
|
|||||||
} else {
|
} else {
|
||||||
appCoordinator = AppCoordinator(appDelegate: appDelegate)
|
appCoordinator = AppCoordinator(appDelegate: appDelegate)
|
||||||
}
|
}
|
||||||
|
|
||||||
SceneDelegate.windowManager = appCoordinator.windowManager
|
SceneDelegate.windowManager = appCoordinator.windowManager
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -109,16 +109,7 @@ class RoomFlowCoordinator: FlowCoordinatorProtocol {
|
|||||||
case .roomList:
|
case .roomList:
|
||||||
stateMachine.tryEvent(.dismissRoom, userInfo: EventUserInfo(animated: animated))
|
stateMachine.tryEvent(.dismissRoom, userInfo: EventUserInfo(animated: animated))
|
||||||
case .roomMemberDetails(let userID):
|
case .roomMemberDetails(let userID):
|
||||||
Task {
|
stateMachine.tryEvent(.presentRoomMemberDetails(userID: userID))
|
||||||
switch await roomProxy?.getMember(userID: userID) {
|
|
||||||
case .success(let member):
|
|
||||||
stateMachine.tryEvent(.presentRoomMemberDetails(member: .init(value: member)))
|
|
||||||
case .failure(let error):
|
|
||||||
MXLog.error("[RoomFlowCoordinator] Failed to get member: \(error)")
|
|
||||||
case .none:
|
|
||||||
MXLog.error("[RoomFlowCoordinator] Failed to get member: RoomProxy is nil")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
case .genericCallLink, .oidcCallback, .settings, .chatBackupSettings:
|
case .genericCallLink, .oidcCallback, .settings, .chatBackupSettings:
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
@@ -173,10 +164,10 @@ class RoomFlowCoordinator: FlowCoordinatorProtocol {
|
|||||||
case (.roomMembersList(let roomID), .dismissRoomMembersList):
|
case (.roomMembersList(let roomID), .dismissRoomMembersList):
|
||||||
return .roomDetails(roomID: roomID, isRoot: false)
|
return .roomDetails(roomID: roomID, isRoot: false)
|
||||||
|
|
||||||
case (.room(let roomID), .presentRoomMemberDetails(let member)):
|
case (.room(let roomID), .presentRoomMemberDetails(userID: let userID)):
|
||||||
return .roomMemberDetails(roomID: roomID, member: member, fromRoomMembersList: false)
|
return .roomMemberDetails(roomID: roomID, userID: userID, fromRoomMembersList: false)
|
||||||
case (.roomMembersList(let roomID), .presentRoomMemberDetails(let member)):
|
case (.roomMembersList(let roomID), .presentRoomMemberDetails(userID: let userID)):
|
||||||
return .roomMemberDetails(roomID: roomID, member: member, fromRoomMembersList: true)
|
return .roomMemberDetails(roomID: roomID, userID: userID, fromRoomMembersList: true)
|
||||||
case (.roomMemberDetails(let roomID, _, let fromRoomMembersList), .dismissRoomMemberDetails):
|
case (.roomMemberDetails(let roomID, _, let fromRoomMembersList), .dismissRoomMemberDetails):
|
||||||
return fromRoomMembersList ? .roomMembersList(roomID: roomID) : .room(roomID: roomID)
|
return fromRoomMembersList ? .roomMembersList(roomID: roomID) : .room(roomID: roomID)
|
||||||
|
|
||||||
@@ -285,13 +276,13 @@ class RoomFlowCoordinator: FlowCoordinatorProtocol {
|
|||||||
case (.roomMembersList, .dismissRoomMembersList, .roomDetails):
|
case (.roomMembersList, .dismissRoomMembersList, .roomDetails):
|
||||||
break
|
break
|
||||||
|
|
||||||
case (.room, .presentRoomMemberDetails, .roomMemberDetails(_, let member, _)):
|
case (.room, .presentRoomMemberDetails, .roomMemberDetails(_, let userID, _)):
|
||||||
presentRoomMemberDetails(member: member.value)
|
presentRoomMemberDetails(userID: userID)
|
||||||
case (.roomMemberDetails, .dismissRoomMemberDetails, .room):
|
case (.roomMemberDetails, .dismissRoomMemberDetails, .room):
|
||||||
break
|
break
|
||||||
|
|
||||||
case (.roomMembersList, .presentRoomMemberDetails, .roomMemberDetails(_, let member, _)):
|
case (.roomMembersList, .presentRoomMemberDetails, .roomMemberDetails(_, let userID, _)):
|
||||||
presentRoomMemberDetails(member: member.value)
|
presentRoomMemberDetails(userID: userID)
|
||||||
case (.roomMemberDetails, .dismissRoomMemberDetails, .roomMembersList):
|
case (.roomMemberDetails, .dismissRoomMemberDetails, .roomMembersList):
|
||||||
break
|
break
|
||||||
|
|
||||||
@@ -469,8 +460,8 @@ class RoomFlowCoordinator: FlowCoordinatorProtocol {
|
|||||||
stateMachine.tryEvent(.presentPollForm(mode: mode))
|
stateMachine.tryEvent(.presentPollForm(mode: mode))
|
||||||
case .presentLocationViewer(_, let geoURI, let description):
|
case .presentLocationViewer(_, let geoURI, let description):
|
||||||
stateMachine.tryEvent(.presentMapNavigator(interactionMode: .viewOnly(geoURI: geoURI, description: description)))
|
stateMachine.tryEvent(.presentMapNavigator(interactionMode: .viewOnly(geoURI: geoURI, description: description)))
|
||||||
case .presentRoomMemberDetails(member: let member):
|
case .presentRoomMemberDetails(userID: let userID):
|
||||||
stateMachine.tryEvent(.presentRoomMemberDetails(member: .init(value: member)))
|
stateMachine.tryEvent(.presentRoomMemberDetails(userID: userID))
|
||||||
case .presentMessageForwarding(let itemID):
|
case .presentMessageForwarding(let itemID):
|
||||||
stateMachine.tryEvent(.presentMessageForwarding(itemID: itemID))
|
stateMachine.tryEvent(.presentMessageForwarding(itemID: itemID))
|
||||||
case .presentCallScreen:
|
case .presentCallScreen:
|
||||||
@@ -598,7 +589,7 @@ class RoomFlowCoordinator: FlowCoordinatorProtocol {
|
|||||||
case .invite:
|
case .invite:
|
||||||
stateMachine.tryEvent(.presentInviteUsersScreen)
|
stateMachine.tryEvent(.presentInviteUsersScreen)
|
||||||
case .selectedMember(let member):
|
case .selectedMember(let member):
|
||||||
stateMachine.tryEvent(.presentRoomMemberDetails(member: .init(value: member)))
|
stateMachine.tryEvent(.presentRoomMemberDetails(userID: member.userID))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.store(in: &cancellables)
|
.store(in: &cancellables)
|
||||||
@@ -931,13 +922,13 @@ class RoomFlowCoordinator: FlowCoordinatorProtocol {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private func presentRoomMemberDetails(member: RoomMemberProxyProtocol) {
|
private func presentRoomMemberDetails(userID: String) {
|
||||||
guard let roomProxy else {
|
guard let roomProxy else {
|
||||||
fatalError()
|
fatalError()
|
||||||
}
|
}
|
||||||
|
|
||||||
let params = RoomMemberDetailsScreenCoordinatorParameters(roomProxy: roomProxy,
|
let params = RoomMemberDetailsScreenCoordinatorParameters(roomProxy: roomProxy,
|
||||||
roomMemberProxy: member,
|
userID: userID,
|
||||||
mediaProvider: userSession.mediaProvider,
|
mediaProvider: userSession.mediaProvider,
|
||||||
userIndicatorController: userIndicatorController)
|
userIndicatorController: userIndicatorController)
|
||||||
let coordinator = RoomMemberDetailsScreenCoordinator(parameters: params)
|
let coordinator = RoomMemberDetailsScreenCoordinator(parameters: params)
|
||||||
@@ -945,7 +936,7 @@ class RoomFlowCoordinator: FlowCoordinatorProtocol {
|
|||||||
coordinator.actions.sink { [weak self] action in
|
coordinator.actions.sink { [weak self] action in
|
||||||
guard let self else { return }
|
guard let self else { return }
|
||||||
switch action {
|
switch action {
|
||||||
case .openDirectChat:
|
case .openDirectChat(let displayName):
|
||||||
let loadingIndicatorIdentifier = "OpenDirectChatLoadingIndicator"
|
let loadingIndicatorIdentifier = "OpenDirectChatLoadingIndicator"
|
||||||
|
|
||||||
userIndicatorController.submitIndicator(UserIndicator(id: loadingIndicatorIdentifier,
|
userIndicatorController.submitIndicator(UserIndicator(id: loadingIndicatorIdentifier,
|
||||||
@@ -956,12 +947,12 @@ class RoomFlowCoordinator: FlowCoordinatorProtocol {
|
|||||||
Task { [weak self] in
|
Task { [weak self] in
|
||||||
guard let self else { return }
|
guard let self else { return }
|
||||||
|
|
||||||
let currentDirectRoom = await userSession.clientProxy.directRoomForUserID(member.userID)
|
let currentDirectRoom = await userSession.clientProxy.directRoomForUserID(userID)
|
||||||
switch currentDirectRoom {
|
switch currentDirectRoom {
|
||||||
case .success(.some(let roomID)):
|
case .success(.some(let roomID)):
|
||||||
stateMachine.tryEvent(.presentRoom(roomID: roomID))
|
stateMachine.tryEvent(.presentRoom(roomID: roomID))
|
||||||
case .success(nil):
|
case .success(nil):
|
||||||
switch await userSession.clientProxy.createDirectRoom(with: member.userID, expectedRoomName: member.displayName) {
|
switch await userSession.clientProxy.createDirectRoom(with: userID, expectedRoomName: displayName) {
|
||||||
case .success(let roomID):
|
case .success(let roomID):
|
||||||
analytics.trackCreatedRoom(isDM: true)
|
analytics.trackCreatedRoom(isDM: true)
|
||||||
stateMachine.tryEvent(.presentRoom(roomID: roomID))
|
stateMachine.tryEvent(.presentRoom(roomID: roomID))
|
||||||
@@ -1185,7 +1176,7 @@ private extension RoomFlowCoordinator {
|
|||||||
case notificationSettings(roomID: String)
|
case notificationSettings(roomID: String)
|
||||||
case globalNotificationSettings(roomID: String)
|
case globalNotificationSettings(roomID: String)
|
||||||
case roomMembersList(roomID: String)
|
case roomMembersList(roomID: String)
|
||||||
case roomMemberDetails(roomID: String, member: HashableRoomMemberWrapper, fromRoomMembersList: Bool)
|
case roomMemberDetails(roomID: String, userID: String, fromRoomMembersList: Bool)
|
||||||
case inviteUsersScreen(roomID: String, fromRoomMembersList: Bool)
|
case inviteUsersScreen(roomID: String, fromRoomMembersList: Bool)
|
||||||
case mediaUploadPicker(roomID: String, source: MediaPickerScreenSource)
|
case mediaUploadPicker(roomID: String, source: MediaPickerScreenSource)
|
||||||
case mediaUploadPreview(roomID: String, fileURL: URL)
|
case mediaUploadPreview(roomID: String, fileURL: URL)
|
||||||
@@ -1225,7 +1216,7 @@ private extension RoomFlowCoordinator {
|
|||||||
case presentRoomMembersList
|
case presentRoomMembersList
|
||||||
case dismissRoomMembersList
|
case dismissRoomMembersList
|
||||||
|
|
||||||
case presentRoomMemberDetails(member: HashableRoomMemberWrapper)
|
case presentRoomMemberDetails(userID: String)
|
||||||
case dismissRoomMemberDetails
|
case dismissRoomMemberDetails
|
||||||
|
|
||||||
case presentInviteUsersScreen
|
case presentInviteUsersScreen
|
||||||
|
|||||||
+8
-6
@@ -19,13 +19,13 @@ import SwiftUI
|
|||||||
|
|
||||||
struct RoomMemberDetailsScreenCoordinatorParameters {
|
struct RoomMemberDetailsScreenCoordinatorParameters {
|
||||||
let roomProxy: RoomProxyProtocol
|
let roomProxy: RoomProxyProtocol
|
||||||
let roomMemberProxy: RoomMemberProxyProtocol
|
let userID: String
|
||||||
let mediaProvider: MediaProviderProtocol
|
let mediaProvider: MediaProviderProtocol
|
||||||
let userIndicatorController: UserIndicatorControllerProtocol
|
let userIndicatorController: UserIndicatorControllerProtocol
|
||||||
}
|
}
|
||||||
|
|
||||||
enum RoomMemberDetailsScreenCoordinatorAction {
|
enum RoomMemberDetailsScreenCoordinatorAction {
|
||||||
case openDirectChat
|
case openDirectChat(displayName: String?)
|
||||||
}
|
}
|
||||||
|
|
||||||
final class RoomMemberDetailsScreenCoordinator: CoordinatorProtocol {
|
final class RoomMemberDetailsScreenCoordinator: CoordinatorProtocol {
|
||||||
@@ -40,7 +40,7 @@ final class RoomMemberDetailsScreenCoordinator: CoordinatorProtocol {
|
|||||||
|
|
||||||
init(parameters: RoomMemberDetailsScreenCoordinatorParameters) {
|
init(parameters: RoomMemberDetailsScreenCoordinatorParameters) {
|
||||||
viewModel = RoomMemberDetailsScreenViewModel(roomProxy: parameters.roomProxy,
|
viewModel = RoomMemberDetailsScreenViewModel(roomProxy: parameters.roomProxy,
|
||||||
roomMemberProxy: parameters.roomMemberProxy,
|
userID: parameters.userID,
|
||||||
mediaProvider: parameters.mediaProvider,
|
mediaProvider: parameters.mediaProvider,
|
||||||
userIndicatorController: parameters.userIndicatorController)
|
userIndicatorController: parameters.userIndicatorController)
|
||||||
}
|
}
|
||||||
@@ -50,14 +50,16 @@ final class RoomMemberDetailsScreenCoordinator: CoordinatorProtocol {
|
|||||||
guard let self else { return }
|
guard let self else { return }
|
||||||
|
|
||||||
switch action {
|
switch action {
|
||||||
case .openDirectChat:
|
case .openDirectChat(let displayName):
|
||||||
actionsSubject.send(.openDirectChat)
|
actionsSubject.send(.openDirectChat(displayName: displayName))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.store(in: &cancellables)
|
.store(in: &cancellables)
|
||||||
}
|
}
|
||||||
|
|
||||||
func stop() { viewModel.stop() }
|
func stop() {
|
||||||
|
viewModel.stop()
|
||||||
|
}
|
||||||
|
|
||||||
func toPresentable() -> AnyView {
|
func toPresentable() -> AnyView {
|
||||||
AnyView(RoomMemberDetailsScreen(context: viewModel.context))
|
AnyView(RoomMemberDetailsScreen(context: viewModel.context))
|
||||||
|
|||||||
+3
-2
@@ -17,11 +17,12 @@
|
|||||||
import Foundation
|
import Foundation
|
||||||
|
|
||||||
enum RoomMemberDetailsScreenViewModelAction {
|
enum RoomMemberDetailsScreenViewModelAction {
|
||||||
case openDirectChat
|
case openDirectChat(displayName: String?)
|
||||||
}
|
}
|
||||||
|
|
||||||
struct RoomMemberDetailsScreenViewState: BindableState {
|
struct RoomMemberDetailsScreenViewState: BindableState {
|
||||||
var details: RoomMemberDetails
|
let userID: String
|
||||||
|
var memberDetails: RoomMemberDetails?
|
||||||
var isProcessingIgnoreRequest = false
|
var isProcessingIgnoreRequest = false
|
||||||
|
|
||||||
var bindings: RoomMemberDetailsScreenViewStateBindings
|
var bindings: RoomMemberDetailsScreenViewStateBindings
|
||||||
|
|||||||
+59
-8
@@ -21,29 +21,46 @@ typealias RoomMemberDetailsScreenViewModelType = StateStoreViewModel<RoomMemberD
|
|||||||
|
|
||||||
class RoomMemberDetailsScreenViewModel: RoomMemberDetailsScreenViewModelType, RoomMemberDetailsScreenViewModelProtocol {
|
class RoomMemberDetailsScreenViewModel: RoomMemberDetailsScreenViewModelType, RoomMemberDetailsScreenViewModelProtocol {
|
||||||
private let roomProxy: RoomProxyProtocol
|
private let roomProxy: RoomProxyProtocol
|
||||||
private let roomMemberProxy: RoomMemberProxyProtocol
|
private let userID: String
|
||||||
private let mediaProvider: MediaProviderProtocol
|
private let mediaProvider: MediaProviderProtocol
|
||||||
private let userIndicatorController: UserIndicatorControllerProtocol
|
private let userIndicatorController: UserIndicatorControllerProtocol
|
||||||
|
|
||||||
private var actionsSubject: PassthroughSubject<RoomMemberDetailsScreenViewModelAction, Never> = .init()
|
private var actionsSubject: PassthroughSubject<RoomMemberDetailsScreenViewModelAction, Never> = .init()
|
||||||
|
|
||||||
|
private var roomMemberProxy: RoomMemberProxyProtocol?
|
||||||
|
|
||||||
var actions: AnyPublisher<RoomMemberDetailsScreenViewModelAction, Never> {
|
var actions: AnyPublisher<RoomMemberDetailsScreenViewModelAction, Never> {
|
||||||
actionsSubject.eraseToAnyPublisher()
|
actionsSubject.eraseToAnyPublisher()
|
||||||
}
|
}
|
||||||
|
|
||||||
init(roomProxy: RoomProxyProtocol,
|
init(roomProxy: RoomProxyProtocol,
|
||||||
roomMemberProxy: RoomMemberProxyProtocol,
|
userID: String,
|
||||||
mediaProvider: MediaProviderProtocol,
|
mediaProvider: MediaProviderProtocol,
|
||||||
userIndicatorController: UserIndicatorControllerProtocol) {
|
userIndicatorController: UserIndicatorControllerProtocol) {
|
||||||
self.roomProxy = roomProxy
|
self.roomProxy = roomProxy
|
||||||
self.roomMemberProxy = roomMemberProxy
|
self.userID = userID
|
||||||
self.mediaProvider = mediaProvider
|
self.mediaProvider = mediaProvider
|
||||||
self.userIndicatorController = userIndicatorController
|
self.userIndicatorController = userIndicatorController
|
||||||
|
|
||||||
let initialViewState = RoomMemberDetailsScreenViewState(details: RoomMemberDetails(withProxy: roomMemberProxy),
|
let initialViewState = RoomMemberDetailsScreenViewState(userID: userID, bindings: .init())
|
||||||
bindings: .init())
|
|
||||||
|
|
||||||
super.init(initialViewState: initialViewState, imageProvider: mediaProvider)
|
super.init(initialViewState: initialViewState, imageProvider: mediaProvider)
|
||||||
|
|
||||||
|
showMemberLoadingIndicator()
|
||||||
|
Task {
|
||||||
|
defer {
|
||||||
|
hideMemberLoadingIndicator()
|
||||||
|
}
|
||||||
|
|
||||||
|
switch await roomProxy.getMember(userID: userID) {
|
||||||
|
case .success(let member):
|
||||||
|
roomMemberProxy = member
|
||||||
|
state.memberDetails = RoomMemberDetails(withProxy: member)
|
||||||
|
case .failure(let error):
|
||||||
|
state.bindings.alertInfo = .init(id: .unknown)
|
||||||
|
MXLog.error("[RoomFlowCoordinator] Failed to get member: \(error)")
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// MARK: - Public
|
// MARK: - Public
|
||||||
@@ -51,6 +68,8 @@ class RoomMemberDetailsScreenViewModel: RoomMemberDetailsScreenViewModelType, Ro
|
|||||||
func stop() {
|
func stop() {
|
||||||
// Work around QLPreviewController dismissal issues, see the InteractiveQuickLookModifier.
|
// Work around QLPreviewController dismissal issues, see the InteractiveQuickLookModifier.
|
||||||
state.bindings.mediaPreviewItem = nil
|
state.bindings.mediaPreviewItem = nil
|
||||||
|
|
||||||
|
hideMemberLoadingIndicator()
|
||||||
}
|
}
|
||||||
|
|
||||||
override func process(viewAction: RoomMemberDetailsScreenViewAction) {
|
override func process(viewAction: RoomMemberDetailsScreenViewAction) {
|
||||||
@@ -66,7 +85,11 @@ class RoomMemberDetailsScreenViewModel: RoomMemberDetailsScreenViewModelType, Ro
|
|||||||
case .displayAvatar:
|
case .displayAvatar:
|
||||||
displayFullScreenAvatar()
|
displayFullScreenAvatar()
|
||||||
case .openDirectChat:
|
case .openDirectChat:
|
||||||
actionsSubject.send(.openDirectChat)
|
guard let roomMemberProxy else {
|
||||||
|
fatalError()
|
||||||
|
}
|
||||||
|
|
||||||
|
actionsSubject.send(.openDirectChat(displayName: roomMemberProxy.displayName))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -74,12 +97,16 @@ class RoomMemberDetailsScreenViewModel: RoomMemberDetailsScreenViewModelType, Ro
|
|||||||
|
|
||||||
@MainActor
|
@MainActor
|
||||||
private func ignoreUser() async {
|
private func ignoreUser() async {
|
||||||
|
guard let roomMemberProxy else {
|
||||||
|
fatalError()
|
||||||
|
}
|
||||||
|
|
||||||
state.isProcessingIgnoreRequest = true
|
state.isProcessingIgnoreRequest = true
|
||||||
let result = await roomMemberProxy.ignoreUser()
|
let result = await roomMemberProxy.ignoreUser()
|
||||||
state.isProcessingIgnoreRequest = false
|
state.isProcessingIgnoreRequest = false
|
||||||
switch result {
|
switch result {
|
||||||
case .success:
|
case .success:
|
||||||
state.details.isIgnored = true
|
state.memberDetails?.isIgnored = true
|
||||||
updateMembers()
|
updateMembers()
|
||||||
case .failure:
|
case .failure:
|
||||||
state.bindings.alertInfo = .init(id: .unknown)
|
state.bindings.alertInfo = .init(id: .unknown)
|
||||||
@@ -88,12 +115,16 @@ class RoomMemberDetailsScreenViewModel: RoomMemberDetailsScreenViewModelType, Ro
|
|||||||
|
|
||||||
@MainActor
|
@MainActor
|
||||||
private func unignoreUser() async {
|
private func unignoreUser() async {
|
||||||
|
guard let roomMemberProxy else {
|
||||||
|
fatalError()
|
||||||
|
}
|
||||||
|
|
||||||
state.isProcessingIgnoreRequest = true
|
state.isProcessingIgnoreRequest = true
|
||||||
let result = await roomMemberProxy.unignoreUser()
|
let result = await roomMemberProxy.unignoreUser()
|
||||||
state.isProcessingIgnoreRequest = false
|
state.isProcessingIgnoreRequest = false
|
||||||
switch result {
|
switch result {
|
||||||
case .success:
|
case .success:
|
||||||
state.details.isIgnored = false
|
state.memberDetails?.isIgnored = false
|
||||||
updateMembers()
|
updateMembers()
|
||||||
case .failure:
|
case .failure:
|
||||||
state.bindings.alertInfo = .init(id: .unknown)
|
state.bindings.alertInfo = .init(id: .unknown)
|
||||||
@@ -107,6 +138,10 @@ class RoomMemberDetailsScreenViewModel: RoomMemberDetailsScreenViewModelType, Ro
|
|||||||
}
|
}
|
||||||
|
|
||||||
private func displayFullScreenAvatar() {
|
private func displayFullScreenAvatar() {
|
||||||
|
guard let roomMemberProxy else {
|
||||||
|
fatalError()
|
||||||
|
}
|
||||||
|
|
||||||
guard let avatarURL = roomMemberProxy.avatarURL else {
|
guard let avatarURL = roomMemberProxy.avatarURL else {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@@ -125,4 +160,20 @@ class RoomMemberDetailsScreenViewModel: RoomMemberDetailsScreenViewModelType, Ro
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// MARK: Loading indicator
|
||||||
|
|
||||||
|
private static let loadingIndicatorIdentifier = "RoomMemberLoading"
|
||||||
|
|
||||||
|
private func showMemberLoadingIndicator() {
|
||||||
|
userIndicatorController.submitIndicator(UserIndicator(id: Self.loadingIndicatorIdentifier,
|
||||||
|
type: .modal(progress: .indeterminate, interactiveDismissDisabled: false, allowsInteraction: true),
|
||||||
|
title: L10n.commonLoading,
|
||||||
|
persistent: true),
|
||||||
|
delay: .milliseconds(100))
|
||||||
|
}
|
||||||
|
|
||||||
|
private func hideMemberLoadingIndicator() {
|
||||||
|
userIndicatorController.retractIndicatorWithId(Self.loadingIndicatorIdentifier)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+1
@@ -20,5 +20,6 @@ import Combine
|
|||||||
protocol RoomMemberDetailsScreenViewModelProtocol {
|
protocol RoomMemberDetailsScreenViewModelProtocol {
|
||||||
var actions: AnyPublisher<RoomMemberDetailsScreenViewModelAction, Never> { get }
|
var actions: AnyPublisher<RoomMemberDetailsScreenViewModelAction, Never> { get }
|
||||||
var context: RoomMemberDetailsScreenViewModelType.Context { get }
|
var context: RoomMemberDetailsScreenViewModelType.Context { get }
|
||||||
|
|
||||||
func stop()
|
func stop()
|
||||||
}
|
}
|
||||||
|
|||||||
+54
-32
@@ -21,14 +21,7 @@ struct RoomMemberDetailsScreen: View {
|
|||||||
@ObservedObject var context: RoomMemberDetailsScreenViewModel.Context
|
@ObservedObject var context: RoomMemberDetailsScreenViewModel.Context
|
||||||
|
|
||||||
var body: some View {
|
var body: some View {
|
||||||
Form {
|
content
|
||||||
headerSection
|
|
||||||
|
|
||||||
if !context.viewState.details.isAccountOwner {
|
|
||||||
directChatSection
|
|
||||||
blockUserSection
|
|
||||||
}
|
|
||||||
}
|
|
||||||
.compoundList()
|
.compoundList()
|
||||||
.alert(item: $context.ignoreUserAlert, actions: blockUserAlertActions, message: blockUserAlertMessage)
|
.alert(item: $context.ignoreUserAlert, actions: blockUserAlertActions, message: blockUserAlertMessage)
|
||||||
.alert(item: $context.alertInfo)
|
.alert(item: $context.alertInfo)
|
||||||
@@ -38,17 +31,31 @@ struct RoomMemberDetailsScreen: View {
|
|||||||
|
|
||||||
// MARK: - Private
|
// MARK: - Private
|
||||||
|
|
||||||
|
@ViewBuilder
|
||||||
|
private var content: some View {
|
||||||
|
Form {
|
||||||
|
headerSection
|
||||||
|
|
||||||
|
if let memberDetails = context.viewState.memberDetails,
|
||||||
|
!memberDetails.isAccountOwner {
|
||||||
|
directChatSection
|
||||||
|
blockUserSection
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@ViewBuilder
|
@ViewBuilder
|
||||||
private var headerSection: some View {
|
private var headerSection: some View {
|
||||||
AvatarHeaderView(avatarUrl: context.viewState.details.avatarURL,
|
if let memberDetails = context.viewState.memberDetails {
|
||||||
name: context.viewState.details.name,
|
AvatarHeaderView(avatarUrl: memberDetails.avatarURL,
|
||||||
id: context.viewState.details.id,
|
name: memberDetails.name,
|
||||||
|
id: memberDetails.id,
|
||||||
avatarSize: .user(on: .memberDetails),
|
avatarSize: .user(on: .memberDetails),
|
||||||
imageProvider: context.imageProvider,
|
imageProvider: context.imageProvider,
|
||||||
subtitle: context.viewState.details.id) {
|
subtitle: memberDetails.id) {
|
||||||
context.send(viewAction: .displayAvatar)
|
context.send(viewAction: .displayAvatar)
|
||||||
} footer: {
|
} footer: {
|
||||||
if let permalink = context.viewState.details.permalink {
|
if let permalink = memberDetails.permalink {
|
||||||
HStack(spacing: 32) {
|
HStack(spacing: 32) {
|
||||||
ShareLink(item: permalink) {
|
ShareLink(item: permalink) {
|
||||||
CompoundIcon(\.shareIos)
|
CompoundIcon(\.shareIos)
|
||||||
@@ -58,6 +65,15 @@ struct RoomMemberDetailsScreen: View {
|
|||||||
.padding(.top, 32)
|
.padding(.top, 32)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
AvatarHeaderView(avatarUrl: nil,
|
||||||
|
name: nil,
|
||||||
|
id: context.viewState.userID,
|
||||||
|
avatarSize: .user(on: .memberDetails),
|
||||||
|
imageProvider: context.imageProvider,
|
||||||
|
subtitle: nil,
|
||||||
|
footer: { })
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private var directChatSection: some View {
|
private var directChatSection: some View {
|
||||||
@@ -71,30 +87,25 @@ struct RoomMemberDetailsScreen: View {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ViewBuilder
|
||||||
private var blockUserSection: some View {
|
private var blockUserSection: some View {
|
||||||
|
if let memberDetails = context.viewState.memberDetails {
|
||||||
|
let title = memberDetails.isIgnored ? L10n.screenRoomMemberDetailsUnblockUser : L10n.screenRoomMemberDetailsBlockUser
|
||||||
|
let action: RoomMemberDetailsScreenViewAction = memberDetails.isIgnored ? .showUnignoreAlert : .showIgnoreAlert
|
||||||
|
let accessibilityIdentifier = memberDetails.isIgnored ? A11yIdentifiers.roomMemberDetailsScreen.unignore : A11yIdentifiers.roomMemberDetailsScreen.ignore
|
||||||
|
|
||||||
Section {
|
Section {
|
||||||
ListRow(label: .default(title: blockUserButtonTitle,
|
ListRow(label: .default(title: title,
|
||||||
icon: \.block,
|
icon: \.block,
|
||||||
role: context.viewState.details.isIgnored ? nil : .destructive),
|
role: memberDetails.isIgnored ? nil : .destructive),
|
||||||
details: .isWaiting(context.viewState.isProcessingIgnoreRequest),
|
details: .isWaiting(context.viewState.isProcessingIgnoreRequest),
|
||||||
kind: .button {
|
kind: .button {
|
||||||
context.send(viewAction: blockUserButtonAction)
|
context.send(viewAction: action)
|
||||||
})
|
})
|
||||||
.accessibilityIdentifier(blockUserButtonAccessibilityIdentifier)
|
.accessibilityIdentifier(accessibilityIdentifier)
|
||||||
.disabled(context.viewState.isProcessingIgnoreRequest)
|
.disabled(context.viewState.isProcessingIgnoreRequest)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private var blockUserButtonAction: RoomMemberDetailsScreenViewAction {
|
|
||||||
context.viewState.details.isIgnored ? .showUnignoreAlert : .showIgnoreAlert
|
|
||||||
}
|
|
||||||
|
|
||||||
private var blockUserButtonTitle: String {
|
|
||||||
context.viewState.details.isIgnored ? L10n.screenRoomMemberDetailsUnblockUser : L10n.screenRoomMemberDetailsBlockUser
|
|
||||||
}
|
|
||||||
|
|
||||||
private var blockUserButtonAccessibilityIdentifier: String {
|
|
||||||
context.viewState.details.isIgnored ? A11yIdentifiers.roomMemberDetailsScreen.unignore : A11yIdentifiers.roomMemberDetailsScreen.ignore
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@ViewBuilder
|
@ViewBuilder
|
||||||
@@ -114,27 +125,35 @@ struct RoomMemberDetailsScreen: View {
|
|||||||
// MARK: - Previews
|
// MARK: - Previews
|
||||||
|
|
||||||
struct RoomMemberDetailsScreen_Previews: PreviewProvider, TestablePreview {
|
struct RoomMemberDetailsScreen_Previews: PreviewProvider, TestablePreview {
|
||||||
static let roomProxyMock = RoomProxyMock(with: .init(displayName: ""))
|
|
||||||
static let otherUserViewModel = {
|
static let otherUserViewModel = {
|
||||||
let member = RoomMemberProxyMock.mockDan
|
let member = RoomMemberProxyMock.mockDan
|
||||||
|
let roomProxyMock = RoomProxyMock(with: .init(displayName: ""))
|
||||||
|
roomProxyMock.getMemberUserIDReturnValue = .success(member)
|
||||||
|
|
||||||
return RoomMemberDetailsScreenViewModel(roomProxy: roomProxyMock,
|
return RoomMemberDetailsScreenViewModel(roomProxy: roomProxyMock,
|
||||||
roomMemberProxy: member,
|
userID: member.userID,
|
||||||
mediaProvider: MockMediaProvider(),
|
mediaProvider: MockMediaProvider(),
|
||||||
userIndicatorController: ServiceLocator.shared.userIndicatorController)
|
userIndicatorController: ServiceLocator.shared.userIndicatorController)
|
||||||
}()
|
}()
|
||||||
|
|
||||||
static let accountOwnerViewModel = {
|
static let accountOwnerViewModel = {
|
||||||
let member = RoomMemberProxyMock.mockMe
|
let member = RoomMemberProxyMock.mockMe
|
||||||
|
let roomProxyMock = RoomProxyMock(with: .init(displayName: ""))
|
||||||
|
roomProxyMock.getMemberUserIDReturnValue = .success(member)
|
||||||
|
|
||||||
return RoomMemberDetailsScreenViewModel(roomProxy: roomProxyMock,
|
return RoomMemberDetailsScreenViewModel(roomProxy: roomProxyMock,
|
||||||
roomMemberProxy: member,
|
userID: member.userID,
|
||||||
mediaProvider: MockMediaProvider(),
|
mediaProvider: MockMediaProvider(),
|
||||||
userIndicatorController: ServiceLocator.shared.userIndicatorController)
|
userIndicatorController: ServiceLocator.shared.userIndicatorController)
|
||||||
}()
|
}()
|
||||||
|
|
||||||
static let ignoredUserViewModel = {
|
static let ignoredUserViewModel = {
|
||||||
let member = RoomMemberProxyMock.mockIgnored
|
let member = RoomMemberProxyMock.mockIgnored
|
||||||
|
let roomProxyMock = RoomProxyMock(with: .init(displayName: ""))
|
||||||
|
roomProxyMock.getMemberUserIDReturnValue = .success(member)
|
||||||
|
|
||||||
return RoomMemberDetailsScreenViewModel(roomProxy: roomProxyMock,
|
return RoomMemberDetailsScreenViewModel(roomProxy: roomProxyMock,
|
||||||
roomMemberProxy: member,
|
userID: member.userID,
|
||||||
mediaProvider: MockMediaProvider(),
|
mediaProvider: MockMediaProvider(),
|
||||||
userIndicatorController: ServiceLocator.shared.userIndicatorController)
|
userIndicatorController: ServiceLocator.shared.userIndicatorController)
|
||||||
}()
|
}()
|
||||||
@@ -142,9 +161,12 @@ struct RoomMemberDetailsScreen_Previews: PreviewProvider, TestablePreview {
|
|||||||
static var previews: some View {
|
static var previews: some View {
|
||||||
RoomMemberDetailsScreen(context: otherUserViewModel.context)
|
RoomMemberDetailsScreen(context: otherUserViewModel.context)
|
||||||
.previewDisplayName("Other User")
|
.previewDisplayName("Other User")
|
||||||
|
.snapshot(delay: 0.25)
|
||||||
RoomMemberDetailsScreen(context: accountOwnerViewModel.context)
|
RoomMemberDetailsScreen(context: accountOwnerViewModel.context)
|
||||||
.previewDisplayName("Account Owner")
|
.previewDisplayName("Account Owner")
|
||||||
|
.snapshot(delay: 0.25)
|
||||||
RoomMemberDetailsScreen(context: ignoredUserViewModel.context)
|
RoomMemberDetailsScreen(context: ignoredUserViewModel.context)
|
||||||
.previewDisplayName("Ignored User")
|
.previewDisplayName("Ignored User")
|
||||||
|
.snapshot(delay: 0.25)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -58,6 +58,10 @@ final class RoomMembersListScreenCoordinator: CoordinatorProtocol {
|
|||||||
.store(in: &cancellables)
|
.store(in: &cancellables)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func stop() {
|
||||||
|
viewModel.stop()
|
||||||
|
}
|
||||||
|
|
||||||
func toPresentable() -> AnyView {
|
func toPresentable() -> AnyView {
|
||||||
AnyView(RoomMembersListScreen(context: viewModel.context))
|
AnyView(RoomMembersListScreen(context: viewModel.context))
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -58,6 +58,10 @@ class RoomMembersListScreenViewModel: RoomMembersListScreenViewModelType, RoomMe
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func stop() {
|
||||||
|
hideLoader()
|
||||||
|
}
|
||||||
|
|
||||||
// MARK: - Private
|
// MARK: - Private
|
||||||
|
|
||||||
private func setupMembers() {
|
private func setupMembers() {
|
||||||
@@ -120,7 +124,11 @@ class RoomMembersListScreenViewModel: RoomMembersListScreenViewModelType, RoomMe
|
|||||||
private let userIndicatorID = UUID().uuidString
|
private let userIndicatorID = UUID().uuidString
|
||||||
|
|
||||||
private func showLoader() {
|
private func showLoader() {
|
||||||
userIndicatorController.submitIndicator(UserIndicator(id: userIndicatorID, type: .modal, title: L10n.commonLoading, persistent: true), delay: .milliseconds(200))
|
userIndicatorController.submitIndicator(UserIndicator(id: userIndicatorID,
|
||||||
|
type: .modal(progress: .indeterminate, interactiveDismissDisabled: false, allowsInteraction: true),
|
||||||
|
title: L10n.commonLoading,
|
||||||
|
persistent: true),
|
||||||
|
delay: .milliseconds(200))
|
||||||
}
|
}
|
||||||
|
|
||||||
private func hideLoader() {
|
private func hideLoader() {
|
||||||
|
|||||||
+2
@@ -20,4 +20,6 @@ import Combine
|
|||||||
protocol RoomMembersListScreenViewModelProtocol {
|
protocol RoomMembersListScreenViewModelProtocol {
|
||||||
var actions: AnyPublisher<RoomMembersListScreenViewModelAction, Never> { get }
|
var actions: AnyPublisher<RoomMembersListScreenViewModelAction, Never> { get }
|
||||||
var context: RoomMembersListScreenViewModelType.Context { get }
|
var context: RoomMembersListScreenViewModelType.Context { get }
|
||||||
|
|
||||||
|
func stop()
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -39,7 +39,7 @@ enum RoomScreenCoordinatorAction {
|
|||||||
case presentPollForm(mode: PollFormMode)
|
case presentPollForm(mode: PollFormMode)
|
||||||
case presentLocationViewer(body: String, geoURI: GeoURI, description: String?)
|
case presentLocationViewer(body: String, geoURI: GeoURI, description: String?)
|
||||||
case presentEmojiPicker(itemID: TimelineItemIdentifier, selectedEmojis: Set<String>)
|
case presentEmojiPicker(itemID: TimelineItemIdentifier, selectedEmojis: Set<String>)
|
||||||
case presentRoomMemberDetails(member: RoomMemberProxyProtocol)
|
case presentRoomMemberDetails(userID: String)
|
||||||
case presentMessageForwarding(itemID: TimelineItemIdentifier)
|
case presentMessageForwarding(itemID: TimelineItemIdentifier)
|
||||||
case presentCallScreen
|
case presentCallScreen
|
||||||
}
|
}
|
||||||
@@ -105,8 +105,8 @@ final class RoomScreenCoordinator: CoordinatorProtocol {
|
|||||||
actionsSubject.send(.presentPollForm(mode: mode))
|
actionsSubject.send(.presentPollForm(mode: mode))
|
||||||
case .displayMediaUploadPreviewScreen(let url):
|
case .displayMediaUploadPreviewScreen(let url):
|
||||||
actionsSubject.send(.presentMediaUploadPreviewScreen(url))
|
actionsSubject.send(.presentMediaUploadPreviewScreen(url))
|
||||||
case .displayRoomMemberDetails(let member):
|
case .displayRoomMemberDetails(userID: let userID):
|
||||||
actionsSubject.send(.presentRoomMemberDetails(member: member))
|
actionsSubject.send(.presentRoomMemberDetails(userID: userID))
|
||||||
case .displayMessageForwarding(let itemID):
|
case .displayMessageForwarding(let itemID):
|
||||||
actionsSubject.send(.presentMessageForwarding(itemID: itemID))
|
actionsSubject.send(.presentMessageForwarding(itemID: itemID))
|
||||||
case .displayLocation(let body, let geoURI, let description):
|
case .displayLocation(let body, let geoURI, let description):
|
||||||
|
|||||||
@@ -25,7 +25,7 @@ enum RoomScreenInteractionHandlerAction {
|
|||||||
case displayMessageForwarding(itemID: TimelineItemIdentifier)
|
case displayMessageForwarding(itemID: TimelineItemIdentifier)
|
||||||
case displayMediaUploadPreviewScreen(url: URL)
|
case displayMediaUploadPreviewScreen(url: URL)
|
||||||
case displayPollForm(mode: PollFormMode)
|
case displayPollForm(mode: PollFormMode)
|
||||||
case displayRoomMemberDetails(member: RoomMemberProxyProtocol)
|
case displayRoomMemberDetails(userID: String)
|
||||||
case showActionMenu(TimelineItemActionMenuInfo)
|
case showActionMenu(TimelineItemActionMenuInfo)
|
||||||
case showDebugInfo(TimelineItemDebugInfo)
|
case showDebugInfo(TimelineItemDebugInfo)
|
||||||
case showConfirmationAlert(AlertInfo<UUID>)
|
case showConfirmationAlert(AlertInfo<UUID>)
|
||||||
@@ -579,19 +579,7 @@ class RoomScreenInteractionHandler {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func handleTappedUser(userID: String) async {
|
func handleTappedUser(userID: String) async {
|
||||||
// This is generally fast but it could take some time for rooms with thousands of users on first load
|
actionsSubject.send(.displayRoomMemberDetails(userID: userID))
|
||||||
// Show a loader only if it takes more than 0.1 seconds
|
|
||||||
showLoadingIndicator(with: .milliseconds(100))
|
|
||||||
let result = await roomProxy.getMember(userID: userID)
|
|
||||||
hideLoadingIndicator()
|
|
||||||
|
|
||||||
switch result {
|
|
||||||
case .success(let member):
|
|
||||||
actionsSubject.send(.displayRoomMemberDetails(member: member))
|
|
||||||
case .failure(let error):
|
|
||||||
actionsSubject.send(.displayError(.alert(L10n.screenRoomErrorFailedRetrievingUserDetails)))
|
|
||||||
MXLog.error("Failed retrieving the user given the following id \(userID) with error: \(error)")
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func processItemTap(_ itemID: TimelineItemIdentifier) async -> RoomTimelineControllerAction {
|
func processItemTap(_ itemID: TimelineItemIdentifier) async -> RoomTimelineControllerAction {
|
||||||
@@ -660,22 +648,6 @@ class RoomScreenInteractionHandler {
|
|||||||
return .none
|
return .none
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// MARK: User indicators
|
|
||||||
|
|
||||||
private static let loadingIndicatorIdentifier = "RoomScreenLoadingIndicator"
|
|
||||||
|
|
||||||
private func showLoadingIndicator(with delay: Duration) {
|
|
||||||
userIndicatorController.submitIndicator(UserIndicator(id: Self.loadingIndicatorIdentifier,
|
|
||||||
type: .modal(progress: .indeterminate, interactiveDismissDisabled: true, allowsInteraction: false),
|
|
||||||
title: L10n.commonLoading,
|
|
||||||
persistent: true),
|
|
||||||
delay: delay)
|
|
||||||
}
|
|
||||||
|
|
||||||
private func hideLoadingIndicator() {
|
|
||||||
userIndicatorController.retractIndicatorWithId(Self.loadingIndicatorIdentifier)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private struct ReplyInfo {
|
private struct ReplyInfo {
|
||||||
|
|||||||
@@ -30,7 +30,7 @@ enum RoomScreenViewModelAction {
|
|||||||
case displayLocationPicker
|
case displayLocationPicker
|
||||||
case displayPollForm(mode: PollFormMode)
|
case displayPollForm(mode: PollFormMode)
|
||||||
case displayMediaUploadPreviewScreen(url: URL)
|
case displayMediaUploadPreviewScreen(url: URL)
|
||||||
case displayRoomMemberDetails(member: RoomMemberProxyProtocol)
|
case displayRoomMemberDetails(userID: String)
|
||||||
case displayMessageForwarding(itemID: TimelineItemIdentifier)
|
case displayMessageForwarding(itemID: TimelineItemIdentifier)
|
||||||
case displayLocation(body: String, geoURI: GeoURI, description: String?)
|
case displayLocation(body: String, geoURI: GeoURI, description: String?)
|
||||||
case composer(action: RoomScreenComposerAction)
|
case composer(action: RoomScreenComposerAction)
|
||||||
|
|||||||
@@ -337,8 +337,8 @@ class RoomScreenViewModel: RoomScreenViewModelType, RoomScreenViewModelProtocol
|
|||||||
actionsSubject.send(.displayReportContent(itemID: itemID, senderID: senderID))
|
actionsSubject.send(.displayReportContent(itemID: itemID, senderID: senderID))
|
||||||
case .displayMediaUploadPreviewScreen(let url):
|
case .displayMediaUploadPreviewScreen(let url):
|
||||||
actionsSubject.send(.displayMediaUploadPreviewScreen(url: url))
|
actionsSubject.send(.displayMediaUploadPreviewScreen(url: url))
|
||||||
case .displayRoomMemberDetails(let member):
|
case .displayRoomMemberDetails(userID: let userID):
|
||||||
actionsSubject.send(.displayRoomMemberDetails(member: member))
|
actionsSubject.send(.displayRoomMemberDetails(userID: userID))
|
||||||
case .showActionMenu(let actionMenuInfo):
|
case .showActionMenu(let actionMenuInfo):
|
||||||
state.bindings.actionMenuInfo = actionMenuInfo
|
state.bindings.actionMenuInfo = actionMenuInfo
|
||||||
case .showDebugInfo(let debugInfo):
|
case .showDebugInfo(let debugInfo):
|
||||||
|
|||||||
@@ -203,6 +203,10 @@ class RoomProxy: RoomProxyProtocol {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func getMember(userID: String) async -> Result<RoomMemberProxyProtocol, RoomProxyError> {
|
func getMember(userID: String) async -> Result<RoomMemberProxyProtocol, RoomProxyError> {
|
||||||
|
if let member = members.value.filter({ $0.userID == userID }).first {
|
||||||
|
return .success(member)
|
||||||
|
}
|
||||||
|
|
||||||
sendMessageBackgroundTask = await backgroundTaskService.startBackgroundTask(withName: backgroundTaskName, isReusable: true)
|
sendMessageBackgroundTask = await backgroundTaskService.startBackgroundTask(withName: backgroundTaskName, isReusable: true)
|
||||||
defer {
|
defer {
|
||||||
sendMessageBackgroundTask?.stop()
|
sendMessageBackgroundTask?.stop()
|
||||||
|
|||||||
@@ -765,25 +765,37 @@ class MockScreen: Identifiable {
|
|||||||
navigationStackCoordinator.setRootCoordinator(coordinator)
|
navigationStackCoordinator.setRootCoordinator(coordinator)
|
||||||
return navigationStackCoordinator
|
return navigationStackCoordinator
|
||||||
case .roomMemberDetailsAccountOwner:
|
case .roomMemberDetailsAccountOwner:
|
||||||
|
let member = RoomMemberProxyMock.mockMe
|
||||||
|
let roomProxy = RoomProxyMock(with: .init(displayName: ""))
|
||||||
|
roomProxy.getMemberUserIDReturnValue = .success(member)
|
||||||
|
|
||||||
let navigationStackCoordinator = NavigationStackCoordinator()
|
let navigationStackCoordinator = NavigationStackCoordinator()
|
||||||
let coordinator = RoomMemberDetailsScreenCoordinator(parameters: .init(roomProxy: RoomProxyMock(with: .init(displayName: "")),
|
let coordinator = RoomMemberDetailsScreenCoordinator(parameters: .init(roomProxy: roomProxy,
|
||||||
roomMemberProxy: RoomMemberProxyMock.mockMe,
|
userID: member.userID,
|
||||||
mediaProvider: MockMediaProvider(),
|
mediaProvider: MockMediaProvider(),
|
||||||
userIndicatorController: ServiceLocator.shared.userIndicatorController))
|
userIndicatorController: ServiceLocator.shared.userIndicatorController))
|
||||||
navigationStackCoordinator.setRootCoordinator(coordinator)
|
navigationStackCoordinator.setRootCoordinator(coordinator)
|
||||||
return navigationStackCoordinator
|
return navigationStackCoordinator
|
||||||
case .roomMemberDetails:
|
case .roomMemberDetails:
|
||||||
|
let member = RoomMemberProxyMock.mockAlice
|
||||||
|
let roomProxy = RoomProxyMock(with: .init(displayName: ""))
|
||||||
|
roomProxy.getMemberUserIDReturnValue = .success(member)
|
||||||
|
|
||||||
let navigationStackCoordinator = NavigationStackCoordinator()
|
let navigationStackCoordinator = NavigationStackCoordinator()
|
||||||
let coordinator = RoomMemberDetailsScreenCoordinator(parameters: .init(roomProxy: RoomProxyMock(with: .init(displayName: "")),
|
let coordinator = RoomMemberDetailsScreenCoordinator(parameters: .init(roomProxy: roomProxy,
|
||||||
roomMemberProxy: RoomMemberProxyMock.mockAlice,
|
userID: member.userID,
|
||||||
mediaProvider: MockMediaProvider(),
|
mediaProvider: MockMediaProvider(),
|
||||||
userIndicatorController: ServiceLocator.shared.userIndicatorController))
|
userIndicatorController: ServiceLocator.shared.userIndicatorController))
|
||||||
navigationStackCoordinator.setRootCoordinator(coordinator)
|
navigationStackCoordinator.setRootCoordinator(coordinator)
|
||||||
return navigationStackCoordinator
|
return navigationStackCoordinator
|
||||||
case .roomMemberDetailsIgnoredUser:
|
case .roomMemberDetailsIgnoredUser:
|
||||||
|
let member = RoomMemberProxyMock.mockIgnored
|
||||||
|
let roomProxy = RoomProxyMock(with: .init(displayName: ""))
|
||||||
|
roomProxy.getMemberUserIDReturnValue = .success(member)
|
||||||
|
|
||||||
let navigationStackCoordinator = NavigationStackCoordinator()
|
let navigationStackCoordinator = NavigationStackCoordinator()
|
||||||
let coordinator = RoomMemberDetailsScreenCoordinator(parameters: .init(roomProxy: RoomProxyMock(with: .init(displayName: "")),
|
let coordinator = RoomMemberDetailsScreenCoordinator(parameters: .init(roomProxy: roomProxy,
|
||||||
roomMemberProxy: RoomMemberProxyMock.mockIgnored,
|
userID: member.userID,
|
||||||
mediaProvider: MockMediaProvider(),
|
mediaProvider: MockMediaProvider(),
|
||||||
userIndicatorController: ServiceLocator.shared.userIndicatorController))
|
userIndicatorController: ServiceLocator.shared.userIndicatorController))
|
||||||
navigationStackCoordinator.setRootCoordinator(coordinator)
|
navigationStackCoordinator.setRootCoordinator(coordinator)
|
||||||
|
|||||||
+2
-2
@@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:7796428efb06e0bdc519e8ccd75ed2bae0d26eb2ed1a75fee143b620aa05ac2f
|
oid sha256:fc1d94cd94c0ffa482707042e08970b9ba280804d0a7062c5674df3767cd6fbf
|
||||||
size 80998
|
size 81052
|
||||||
|
|||||||
+2
-2
@@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:7fe0377786a0837bfce257531b9a25eb6c9249aaa244a0ce46ef8e0a51c156a1
|
oid sha256:5a853c9add8c1ca60541024ff68797c8eb0bb8ced14aa4f30a91206c1af0e745
|
||||||
size 86009
|
size 85853
|
||||||
|
|||||||
+2
-2
@@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:8493f5a8c052742c71503b4961fa79d6dab9f15204fff5e031fac20b29d4c8d2
|
oid sha256:e376247a6481f076c86a4d3f479fcf47fb9e4431a12a7979270dfdd285ef64f6
|
||||||
size 82132
|
size 82304
|
||||||
|
|||||||
@@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:8ad2483488656f627d796a513fdfc73e6e95234532a9e3991071398b0a6d877c
|
oid sha256:4240cb1086b7b5eec729f998bebee2a538dbb66b0cabfe106de35282846c2f06
|
||||||
size 93983
|
size 94162
|
||||||
|
|||||||
+2
-2
@@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:0b8463d12166442fa4b38588efff9fe3104b3315a9b8d6491d74ee4a1282903b
|
oid sha256:4a8e373a160e53b4a1b47acb4c0f7e6f392256eb1ed60b3a39801e7e3ed0e070
|
||||||
size 109456
|
size 109543
|
||||||
|
|||||||
+2
-2
@@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:bd3aa1cf99160b3dc6444cbda7880fd82a72e8f1fb37c9924be6b332386dc5cb
|
oid sha256:b40b1dee358f4beb14919d10e914603de5a2c9ed3155c4915130ffa8fbd3b0e3
|
||||||
size 95708
|
size 95956
|
||||||
|
|||||||
+2
-2
@@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:b576b859c7623d04d690e07db1497a3ef96bdb991f99b3d7491b92416e509914
|
oid sha256:36a8cc8330733bf7759f9c59f409a483c65b4baac0e42e25cfe817a1d8f53de5
|
||||||
size 82531
|
size 82610
|
||||||
|
|||||||
+2
-2
@@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:f4f66540153d511f73751417230261ed0ab3045125793ca62f70f7f771020fe7
|
oid sha256:a0b91a069211430da0d3c23668dd41fc3d152b167d2c9d7dc2423b018046defd
|
||||||
size 86618
|
size 86466
|
||||||
|
|||||||
+2
-2
@@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:3a766ae738267e9fb0b82e452abd9ee75a8932ff9e804ce51e5cbcd4ff296929
|
oid sha256:9247769c091d629b96306e1b3df84065334c79bea019a5a309b984c6967e57b6
|
||||||
size 83794
|
size 83971
|
||||||
|
|||||||
@@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:8eddfe670a05acc38693d421d56c7e4ca2648b6688b2abbb12fe6b67c5b89a58
|
oid sha256:6e34ac88160a5e648f9be27ed3b6f86fdd57cd5f586d15cdf5851b67faad94d3
|
||||||
size 96045
|
size 96222
|
||||||
|
|||||||
+2
-2
@@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:6393286dae6a498c765162b129af1b9e6e65fe67475ab4c3a93473f40ab6ca2f
|
oid sha256:0c1408a1910c6857201570c86bfbc40358ac9dc153eeee8ceeec313392f9c8e2
|
||||||
size 109818
|
size 109902
|
||||||
|
|||||||
+2
-2
@@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:e976d63cbc1b01d5262859c81d3c267bbdc10a434a27547a17ac3e282f859044
|
oid sha256:47cfee933d2249d93f759bf5fee05439d0ed08e08c7c968c90225ac712f9b28c
|
||||||
size 97559
|
size 97819
|
||||||
|
|||||||
@@ -27,16 +27,23 @@ class RoomMemberDetailsViewModelTests: XCTestCase {
|
|||||||
|
|
||||||
override func setUp() async throws {
|
override func setUp() async throws {
|
||||||
roomProxyMock = RoomProxyMock(with: .init(displayName: ""))
|
roomProxyMock = RoomProxyMock(with: .init(displayName: ""))
|
||||||
|
|
||||||
|
roomProxyMock.getMemberUserIDClosure = { _ in
|
||||||
|
.success(self.roomMemberProxyMock)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func testInitialState() async {
|
func testInitialState() async throws {
|
||||||
roomMemberProxyMock = RoomMemberProxyMock.mockAlice
|
roomMemberProxyMock = RoomMemberProxyMock.mockAlice
|
||||||
viewModel = RoomMemberDetailsScreenViewModel(roomProxy: roomProxyMock,
|
viewModel = RoomMemberDetailsScreenViewModel(roomProxy: roomProxyMock,
|
||||||
roomMemberProxy: roomMemberProxyMock,
|
userID: roomMemberProxyMock.userID,
|
||||||
mediaProvider: MockMediaProvider(),
|
mediaProvider: MockMediaProvider(),
|
||||||
userIndicatorController: ServiceLocator.shared.userIndicatorController)
|
userIndicatorController: ServiceLocator.shared.userIndicatorController)
|
||||||
|
|
||||||
XCTAssertEqual(context.viewState.details, RoomMemberDetails(withProxy: roomMemberProxyMock))
|
let waitForMemberToLoad = deferFulfillment(context.$viewState) { $0.memberDetails != nil }
|
||||||
|
try await waitForMemberToLoad.fulfill()
|
||||||
|
|
||||||
|
XCTAssertEqual(context.viewState.memberDetails, RoomMemberDetails(withProxy: roomMemberProxyMock))
|
||||||
XCTAssertNil(context.ignoreUserAlert)
|
XCTAssertNil(context.ignoreUserAlert)
|
||||||
XCTAssertNil(context.alertInfo)
|
XCTAssertNil(context.alertInfo)
|
||||||
}
|
}
|
||||||
@@ -48,23 +55,33 @@ class RoomMemberDetailsViewModelTests: XCTestCase {
|
|||||||
return .success(())
|
return .success(())
|
||||||
}
|
}
|
||||||
viewModel = RoomMemberDetailsScreenViewModel(roomProxy: roomProxyMock,
|
viewModel = RoomMemberDetailsScreenViewModel(roomProxy: roomProxyMock,
|
||||||
roomMemberProxy: roomMemberProxyMock,
|
userID: roomMemberProxyMock.userID,
|
||||||
mediaProvider: MockMediaProvider(),
|
mediaProvider: MockMediaProvider(),
|
||||||
userIndicatorController: ServiceLocator.shared.userIndicatorController)
|
userIndicatorController: ServiceLocator.shared.userIndicatorController)
|
||||||
|
|
||||||
|
let waitForMemberToLoad = deferFulfillment(context.$viewState) { $0.memberDetails != nil }
|
||||||
|
try await waitForMemberToLoad.fulfill()
|
||||||
|
|
||||||
context.send(viewAction: .showIgnoreAlert)
|
context.send(viewAction: .showIgnoreAlert)
|
||||||
XCTAssertEqual(context.ignoreUserAlert, .init(action: .ignore))
|
XCTAssertEqual(context.ignoreUserAlert, .init(action: .ignore))
|
||||||
|
|
||||||
context.send(viewAction: .ignoreConfirmed)
|
context.send(viewAction: .ignoreConfirmed)
|
||||||
|
|
||||||
let deferred = deferFulfillment(context.$viewState) { state in
|
let deferred = deferFulfillment(context.$viewState) { state in
|
||||||
state.details.isIgnored
|
state.memberDetails?.isIgnored == true
|
||||||
}
|
}
|
||||||
|
|
||||||
try await deferred.fulfill()
|
try await deferred.fulfill()
|
||||||
|
|
||||||
|
guard let memberDetails = context.viewState.memberDetails else {
|
||||||
|
XCTFail("Member details should be loaded at this point")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
XCTAssertTrue(memberDetails.isIgnored)
|
||||||
|
|
||||||
XCTAssertFalse(context.viewState.isProcessingIgnoreRequest)
|
XCTAssertFalse(context.viewState.isProcessingIgnoreRequest)
|
||||||
XCTAssertTrue(context.viewState.details.isIgnored)
|
|
||||||
try await Task.sleep(for: .milliseconds(100))
|
try await Task.sleep(for: .milliseconds(100))
|
||||||
XCTAssertTrue(roomProxyMock.updateMembersCalled)
|
XCTAssertTrue(roomProxyMock.updateMembersCalled)
|
||||||
}
|
}
|
||||||
@@ -76,9 +93,13 @@ class RoomMemberDetailsViewModelTests: XCTestCase {
|
|||||||
return .failure(.ignoreUserFailed)
|
return .failure(.ignoreUserFailed)
|
||||||
}
|
}
|
||||||
viewModel = RoomMemberDetailsScreenViewModel(roomProxy: roomProxyMock,
|
viewModel = RoomMemberDetailsScreenViewModel(roomProxy: roomProxyMock,
|
||||||
roomMemberProxy: roomMemberProxyMock,
|
userID: roomMemberProxyMock.userID,
|
||||||
mediaProvider: MockMediaProvider(),
|
mediaProvider: MockMediaProvider(),
|
||||||
userIndicatorController: ServiceLocator.shared.userIndicatorController)
|
userIndicatorController: ServiceLocator.shared.userIndicatorController)
|
||||||
|
|
||||||
|
let waitForMemberToLoad = deferFulfillment(context.$viewState) { $0.memberDetails != nil }
|
||||||
|
try await waitForMemberToLoad.fulfill()
|
||||||
|
|
||||||
context.send(viewAction: .showIgnoreAlert)
|
context.send(viewAction: .showIgnoreAlert)
|
||||||
XCTAssertEqual(context.ignoreUserAlert, .init(action: .ignore))
|
XCTAssertEqual(context.ignoreUserAlert, .init(action: .ignore))
|
||||||
|
|
||||||
@@ -90,8 +111,15 @@ class RoomMemberDetailsViewModelTests: XCTestCase {
|
|||||||
|
|
||||||
try await deferred.fulfill()
|
try await deferred.fulfill()
|
||||||
|
|
||||||
|
guard let memberDetails = context.viewState.memberDetails else {
|
||||||
|
XCTFail("Member details should be loaded at this point")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
XCTAssertFalse(memberDetails.isIgnored)
|
||||||
|
|
||||||
XCTAssertNotNil(context.alertInfo)
|
XCTAssertNotNil(context.alertInfo)
|
||||||
XCTAssertFalse(context.viewState.details.isIgnored)
|
|
||||||
try await Task.sleep(for: .milliseconds(100))
|
try await Task.sleep(for: .milliseconds(100))
|
||||||
XCTAssertFalse(roomProxyMock.updateMembersCalled)
|
XCTAssertFalse(roomProxyMock.updateMembersCalled)
|
||||||
}
|
}
|
||||||
@@ -102,39 +130,51 @@ class RoomMemberDetailsViewModelTests: XCTestCase {
|
|||||||
try? await Task.sleep(for: .milliseconds(100))
|
try? await Task.sleep(for: .milliseconds(100))
|
||||||
return .success(())
|
return .success(())
|
||||||
}
|
}
|
||||||
|
|
||||||
viewModel = RoomMemberDetailsScreenViewModel(roomProxy: roomProxyMock,
|
viewModel = RoomMemberDetailsScreenViewModel(roomProxy: roomProxyMock,
|
||||||
roomMemberProxy: roomMemberProxyMock,
|
userID: roomMemberProxyMock.userID,
|
||||||
mediaProvider: MockMediaProvider(),
|
mediaProvider: MockMediaProvider(),
|
||||||
userIndicatorController: ServiceLocator.shared.userIndicatorController)
|
userIndicatorController: ServiceLocator.shared.userIndicatorController)
|
||||||
|
|
||||||
|
let waitForMemberToLoad = deferFulfillment(context.$viewState) { $0.memberDetails != nil }
|
||||||
|
try await waitForMemberToLoad.fulfill()
|
||||||
|
|
||||||
context.send(viewAction: .showUnignoreAlert)
|
context.send(viewAction: .showUnignoreAlert)
|
||||||
XCTAssertEqual(context.ignoreUserAlert, .init(action: .unignore))
|
XCTAssertEqual(context.ignoreUserAlert, .init(action: .unignore))
|
||||||
|
|
||||||
context.send(viewAction: .unignoreConfirmed)
|
context.send(viewAction: .unignoreConfirmed)
|
||||||
|
|
||||||
let deferred = deferFulfillment(context.$viewState) { state in
|
let deferred = deferFulfillment(context.$viewState) { state in
|
||||||
state.details.isIgnored == false
|
state.memberDetails?.isIgnored == false
|
||||||
}
|
}
|
||||||
|
|
||||||
try await deferred.fulfill()
|
try await deferred.fulfill()
|
||||||
|
|
||||||
XCTAssertFalse(context.viewState.details.isIgnored)
|
guard let memberDetails = context.viewState.memberDetails else {
|
||||||
|
XCTFail("Member details should be loaded at this point")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
XCTAssertFalse(memberDetails.isIgnored)
|
||||||
|
|
||||||
try await Task.sleep(for: .milliseconds(100))
|
try await Task.sleep(for: .milliseconds(100))
|
||||||
XCTAssertTrue(roomProxyMock.updateMembersCalled)
|
XCTAssertTrue(roomProxyMock.updateMembersCalled)
|
||||||
}
|
}
|
||||||
|
|
||||||
func testUnignoreFailure() async throws {
|
func testUnignoreFailure() async throws {
|
||||||
roomProxyMock = RoomProxyMock(with: .init(displayName: ""))
|
|
||||||
roomMemberProxyMock = RoomMemberProxyMock.mockIgnored
|
roomMemberProxyMock = RoomMemberProxyMock.mockIgnored
|
||||||
roomMemberProxyMock.unignoreUserClosure = {
|
roomMemberProxyMock.unignoreUserClosure = {
|
||||||
try? await Task.sleep(for: .milliseconds(100))
|
try? await Task.sleep(for: .milliseconds(100))
|
||||||
return .failure(.unignoreUserFailed)
|
return .failure(.unignoreUserFailed)
|
||||||
}
|
}
|
||||||
viewModel = RoomMemberDetailsScreenViewModel(roomProxy: roomProxyMock,
|
viewModel = RoomMemberDetailsScreenViewModel(roomProxy: roomProxyMock,
|
||||||
roomMemberProxy: roomMemberProxyMock,
|
userID: roomMemberProxyMock.userID,
|
||||||
mediaProvider: MockMediaProvider(),
|
mediaProvider: MockMediaProvider(),
|
||||||
userIndicatorController: ServiceLocator.shared.userIndicatorController)
|
userIndicatorController: ServiceLocator.shared.userIndicatorController)
|
||||||
|
|
||||||
|
let waitForMemberToLoad = deferFulfillment(context.$viewState) { $0.memberDetails != nil }
|
||||||
|
try await waitForMemberToLoad.fulfill()
|
||||||
|
|
||||||
context.send(viewAction: .showUnignoreAlert)
|
context.send(viewAction: .showUnignoreAlert)
|
||||||
XCTAssertEqual(context.ignoreUserAlert, .init(action: .unignore))
|
XCTAssertEqual(context.ignoreUserAlert, .init(action: .unignore))
|
||||||
|
|
||||||
@@ -146,32 +186,45 @@ class RoomMemberDetailsViewModelTests: XCTestCase {
|
|||||||
|
|
||||||
try await deferred.fulfill()
|
try await deferred.fulfill()
|
||||||
|
|
||||||
XCTAssertTrue(context.viewState.details.isIgnored)
|
guard let memberDetails = context.viewState.memberDetails else {
|
||||||
|
XCTFail("Member details should be loaded at this point")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
XCTAssertTrue(memberDetails.isIgnored)
|
||||||
|
|
||||||
XCTAssertNotNil(context.alertInfo)
|
XCTAssertNotNil(context.alertInfo)
|
||||||
|
|
||||||
try await Task.sleep(for: .milliseconds(100))
|
try await Task.sleep(for: .milliseconds(100))
|
||||||
XCTAssertFalse(roomProxyMock.updateMembersCalled)
|
XCTAssertFalse(roomProxyMock.updateMembersCalled)
|
||||||
}
|
}
|
||||||
|
|
||||||
func testInitialStateAccountOwner() async {
|
func testInitialStateAccountOwner() async throws {
|
||||||
roomMemberProxyMock = RoomMemberProxyMock.mockMe
|
roomMemberProxyMock = RoomMemberProxyMock.mockMe
|
||||||
viewModel = RoomMemberDetailsScreenViewModel(roomProxy: roomProxyMock,
|
viewModel = RoomMemberDetailsScreenViewModel(roomProxy: roomProxyMock,
|
||||||
roomMemberProxy: roomMemberProxyMock,
|
userID: roomMemberProxyMock.userID,
|
||||||
mediaProvider: MockMediaProvider(),
|
mediaProvider: MockMediaProvider(),
|
||||||
userIndicatorController: ServiceLocator.shared.userIndicatorController)
|
userIndicatorController: ServiceLocator.shared.userIndicatorController)
|
||||||
|
|
||||||
XCTAssertEqual(context.viewState.details, RoomMemberDetails(withProxy: roomMemberProxyMock))
|
let waitForMemberToLoad = deferFulfillment(context.$viewState) { $0.memberDetails != nil }
|
||||||
|
try await waitForMemberToLoad.fulfill()
|
||||||
|
|
||||||
|
XCTAssertEqual(context.viewState.memberDetails, RoomMemberDetails(withProxy: roomMemberProxyMock))
|
||||||
XCTAssertNil(context.ignoreUserAlert)
|
XCTAssertNil(context.ignoreUserAlert)
|
||||||
XCTAssertNil(context.alertInfo)
|
XCTAssertNil(context.alertInfo)
|
||||||
}
|
}
|
||||||
|
|
||||||
func testInitialStateIgnoredUser() async {
|
func testInitialStateIgnoredUser() async throws {
|
||||||
roomMemberProxyMock = RoomMemberProxyMock.mockIgnored
|
roomMemberProxyMock = RoomMemberProxyMock.mockIgnored
|
||||||
viewModel = RoomMemberDetailsScreenViewModel(roomProxy: roomProxyMock,
|
viewModel = RoomMemberDetailsScreenViewModel(roomProxy: roomProxyMock,
|
||||||
roomMemberProxy: roomMemberProxyMock,
|
userID: roomMemberProxyMock.userID,
|
||||||
mediaProvider: MockMediaProvider(),
|
mediaProvider: MockMediaProvider(),
|
||||||
userIndicatorController: ServiceLocator.shared.userIndicatorController)
|
userIndicatorController: ServiceLocator.shared.userIndicatorController)
|
||||||
|
|
||||||
XCTAssertEqual(context.viewState.details, RoomMemberDetails(withProxy: roomMemberProxyMock))
|
let waitForMemberToLoad = deferFulfillment(context.$viewState) { $0.memberDetails != nil }
|
||||||
|
try await waitForMemberToLoad.fulfill()
|
||||||
|
|
||||||
|
XCTAssertEqual(context.viewState.memberDetails, RoomMemberDetails(withProxy: roomMemberProxyMock))
|
||||||
XCTAssertNil(context.ignoreUserAlert)
|
XCTAssertNil(context.ignoreUserAlert)
|
||||||
XCTAssertNil(context.alertInfo)
|
XCTAssertNil(context.alertInfo)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -203,131 +203,6 @@ class RoomScreenViewModelTests: XCTestCase {
|
|||||||
XCTAssertEqual(viewModel.state.timelineViewState.itemViewStates[2].groupStyle, .last, "Reactions on the last message should not prevent it from being grouped.")
|
XCTAssertEqual(viewModel.state.timelineViewState.itemViewStates[2].groupStyle, .last, "Reactions on the last message should not prevent it from being grouped.")
|
||||||
}
|
}
|
||||||
|
|
||||||
// MARK: - User Details
|
|
||||||
|
|
||||||
func testGoToUserDetailsSuccessNoDelay() async {
|
|
||||||
// Setup
|
|
||||||
let expectation = expectation(description: #function)
|
|
||||||
let timelineController = MockRoomTimelineController()
|
|
||||||
let roomProxyMock = RoomProxyMock(with: .init(displayName: ""))
|
|
||||||
let roomMemberMock = RoomMemberProxyMock()
|
|
||||||
roomMemberMock.userID = "bob"
|
|
||||||
roomProxyMock.getMemberUserIDReturnValue = .success(roomMemberMock)
|
|
||||||
|
|
||||||
let viewModel = RoomScreenViewModel(roomProxy: roomProxyMock,
|
|
||||||
timelineController: timelineController,
|
|
||||||
mediaProvider: MockMediaProvider(),
|
|
||||||
mediaPlayerProvider: MediaPlayerProviderMock(),
|
|
||||||
voiceMessageMediaManager: VoiceMessageMediaManagerMock(),
|
|
||||||
userIndicatorController: userIndicatorControllerMock,
|
|
||||||
application: ApplicationMock.default,
|
|
||||||
appSettings: ServiceLocator.shared.settings,
|
|
||||||
analyticsService: ServiceLocator.shared.analytics,
|
|
||||||
notificationCenter: NotificationCenterMock())
|
|
||||||
viewModel.actions
|
|
||||||
.sink { action in
|
|
||||||
switch action {
|
|
||||||
case .displayRoomMemberDetails(let member):
|
|
||||||
XCTAssert(member === roomMemberMock)
|
|
||||||
default:
|
|
||||||
XCTFail("Did not received the expected action")
|
|
||||||
}
|
|
||||||
expectation.fulfill()
|
|
||||||
}
|
|
||||||
.store(in: &cancellables)
|
|
||||||
|
|
||||||
// Test
|
|
||||||
viewModel.context.send(viewAction: .tappedOnUser(userID: "bob"))
|
|
||||||
await fulfillment(of: [expectation])
|
|
||||||
XCTAssert(userIndicatorControllerMock.submitIndicatorDelayCallsCount == 1)
|
|
||||||
XCTAssert(roomProxyMock.getMemberUserIDCallsCount == 1)
|
|
||||||
XCTAssertEqual(roomProxyMock.getMemberUserIDReceivedUserID, "bob")
|
|
||||||
}
|
|
||||||
|
|
||||||
func testGoToUserDetailsSuccessWithDelay() async {
|
|
||||||
// Setup
|
|
||||||
let timelineController = MockRoomTimelineController()
|
|
||||||
let roomProxyMock = RoomProxyMock(with: .init(displayName: ""))
|
|
||||||
let roomMemberMock = RoomMemberProxyMock()
|
|
||||||
roomMemberMock.userID = "bob"
|
|
||||||
let expectation = XCTestExpectation(description: "Go to user details")
|
|
||||||
|
|
||||||
roomProxyMock.getMemberUserIDClosure = { _ in
|
|
||||||
.success(roomMemberMock)
|
|
||||||
}
|
|
||||||
|
|
||||||
let viewModel = RoomScreenViewModel(roomProxy: roomProxyMock,
|
|
||||||
timelineController: timelineController,
|
|
||||||
mediaProvider: MockMediaProvider(),
|
|
||||||
mediaPlayerProvider: MediaPlayerProviderMock(),
|
|
||||||
voiceMessageMediaManager: VoiceMessageMediaManagerMock(),
|
|
||||||
userIndicatorController: userIndicatorControllerMock,
|
|
||||||
application: ApplicationMock.default,
|
|
||||||
appSettings: ServiceLocator.shared.settings,
|
|
||||||
analyticsService: ServiceLocator.shared.analytics,
|
|
||||||
notificationCenter: NotificationCenterMock())
|
|
||||||
|
|
||||||
viewModel.actions
|
|
||||||
.sink { action in
|
|
||||||
switch action {
|
|
||||||
case .displayRoomMemberDetails(let member):
|
|
||||||
XCTAssert(member === roomMemberMock)
|
|
||||||
expectation.fulfill()
|
|
||||||
default:
|
|
||||||
XCTFail("Did not received the expected action")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
.store(in: &cancellables)
|
|
||||||
|
|
||||||
// Test
|
|
||||||
viewModel.context.send(viewAction: .tappedOnUser(userID: "bob"))
|
|
||||||
await fulfillment(of: [expectation])
|
|
||||||
|
|
||||||
XCTAssert(userIndicatorControllerMock.submitIndicatorDelayCallsCount == 1)
|
|
||||||
XCTAssert(userIndicatorControllerMock.retractIndicatorWithIdCallsCount == 1)
|
|
||||||
XCTAssert(roomProxyMock.getMemberUserIDCallsCount == 1)
|
|
||||||
XCTAssertEqual(roomProxyMock.getMemberUserIDReceivedUserID, "bob")
|
|
||||||
}
|
|
||||||
|
|
||||||
func testGoToUserDetailsFailure() async throws {
|
|
||||||
// Setup
|
|
||||||
let timelineController = MockRoomTimelineController()
|
|
||||||
let roomProxyMock = RoomProxyMock(with: .init(displayName: ""))
|
|
||||||
let roomMemberMock = RoomMemberProxyMock()
|
|
||||||
roomMemberMock.userID = "bob"
|
|
||||||
roomProxyMock.getMemberUserIDClosure = { _ in
|
|
||||||
.failure(.failedRetrievingMember)
|
|
||||||
}
|
|
||||||
|
|
||||||
let viewModel = RoomScreenViewModel(roomProxy: roomProxyMock,
|
|
||||||
timelineController: timelineController,
|
|
||||||
mediaProvider: MockMediaProvider(),
|
|
||||||
mediaPlayerProvider: MediaPlayerProviderMock(),
|
|
||||||
voiceMessageMediaManager: VoiceMessageMediaManagerMock(),
|
|
||||||
userIndicatorController: userIndicatorControllerMock,
|
|
||||||
application: ApplicationMock.default,
|
|
||||||
appSettings: ServiceLocator.shared.settings,
|
|
||||||
analyticsService: ServiceLocator.shared.analytics,
|
|
||||||
notificationCenter: NotificationCenterMock())
|
|
||||||
viewModel.actions
|
|
||||||
.sink { _ in
|
|
||||||
XCTFail("Should not receive any action")
|
|
||||||
}
|
|
||||||
.store(in: &cancellables)
|
|
||||||
|
|
||||||
let deferred = deferFulfillment(viewModel.context.$viewState) { value in
|
|
||||||
value.bindings.alertInfo != nil
|
|
||||||
}
|
|
||||||
|
|
||||||
viewModel.context.send(viewAction: .tappedOnUser(userID: "bob"))
|
|
||||||
|
|
||||||
try await deferred.fulfill()
|
|
||||||
|
|
||||||
XCTAssertFalse(viewModel.state.bindings.alertInfo.isNil)
|
|
||||||
XCTAssert(roomProxyMock.getMemberUserIDCallsCount == 1)
|
|
||||||
XCTAssertEqual(roomProxyMock.getMemberUserIDReceivedUserID, "bob")
|
|
||||||
}
|
|
||||||
|
|
||||||
// MARK: - Sending
|
// MARK: - Sending
|
||||||
|
|
||||||
func testRetrySend() async throws {
|
func testRetrySend() async throws {
|
||||||
|
|||||||
@@ -0,0 +1 @@
|
|||||||
|
Move member loading to the room member detail screen, avoid blocking the whole application
|
||||||
Reference in New Issue
Block a user