felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-04-26 03:20:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

Wrong copy for upgrade room message (#6003)

Browse Source 
* Wrong copy for upgrade room message

- fixed
This commit is contained in:
Gil Eluard
2022-04-11 15:46:08 +02:00
committed by GitHub
parent 8c803e5b50
commit 728a80f328
22 changed files with 133 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
RiotSwiftUI/Modules/Spaces/SpaceSettings/Coordinator/SpaceSettingsModalCoordinator.swift
+1 -1
View File
@@ -142,7 +142,7 @@ final class SpaceSettingsModalCoordinator: Coordinator {
return
}
// Needed more tests on synaose side before starting space upgrade implementation
let coordinator = RoomAccessCoordinator(parameters: RoomAccessCoordinatorParameters(room: room, allowsRoomUpgrade: false))
let coordinator = RoomAccessCoordinator(parameters: RoomAccessCoordinatorParameters(room: room, parentSpaceId: parameters.parentSpaceId, allowsRoomUpgrade: false))
coordinator.callback = { [weak self] result in
guard let self = self else { return }
RiotSwiftUI/Modules/Spaces/SpaceSettings/Coordinator/SpaceSettingsModalCoordinatorBridgePresenter.swift
+4 -2
View File
@@ -36,6 +36,7 @@ final class SpaceSettingsModalCoordinatorBridgePresenter: NSObject {
private let spaceId: String
private let session: MXSession
private let parentSpaceId: String?
private var coordinator: SpaceSettingsModalCoordinator?
// MARK: Public
@@ -44,8 +45,9 @@ final class SpaceSettingsModalCoordinatorBridgePresenter: NSObject {
// MARK: - Setup
init(spaceId: String, session: MXSession) {
init(spaceId: String, parentSpaceId: String?, session: MXSession) {
self.spaceId = spaceId
self.parentSpaceId = parentSpaceId
self.session = session
super.init()
}
@@ -54,7 +56,7 @@ final class SpaceSettingsModalCoordinatorBridgePresenter: NSObject {
func present(from viewController: UIViewController, animated: Bool) {
let navigationRouter = NavigationRouter()
let coordinator = SpaceSettingsModalCoordinator(parameters: SpaceSettingsModalCoordinatorParameters(session: session, spaceId: spaceId, navigationRouter: navigationRouter))
let coordinator = SpaceSettingsModalCoordinator(parameters: SpaceSettingsModalCoordinatorParameters(session: session, spaceId: spaceId, parentSpaceId: parentSpaceId, navigationRouter: navigationRouter))
coordinator.callback = { [weak self] result in
guard let self = self else { return }
RiotSwiftUI/Modules/Spaces/SpaceSettings/Coordinator/SpaceSettingsModalCoordinatorParameters.swift
+5
View File
@@ -24,15 +24,20 @@ struct SpaceSettingsModalCoordinatorParameters {
/// The ID of the space
let spaceId: String
/// The ID of the currently selected parent of this space. `nil` for home
let parentSpaceId: String?
/// The navigation router that manage physical navigation
let navigationRouter: NavigationRouterType
init(session: MXSession,
spaceId: String,
parentSpaceId: String?,
navigationRouter: NavigationRouterType? = nil) {
self.session = session
self.spaceId = spaceId
self.parentSpaceId = parentSpaceId
self.navigationRouter = navigationRouter ?? NavigationRouter(navigationController: RiotNavigationController())
}
}