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

Add a workaround to include some via parameters for room v12 tombstone links. (#4413)

Browse Source 
Without them, following the link fails as previously the server could use the server name from the room ID (which in and of itself seems somewhat error prone).
This commit is contained in:
Doug
2025-08-14 13:02:07 +01:00
committed by GitHub
parent 3dc6d73899
commit de626186bd
7 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ElementX/Sources/Screens/RoomScreen/RoomScreenCoordinator.swift
+5 -5
View File
@@ -46,7 +46,7 @@ enum RoomScreenCoordinatorAction {
case presentResolveSendFailure(failure: TimelineItemSendFailure.VerifiedUser, sendHandle: SendHandleProxy)
case presentKnockRequestsList
case presentThread(itemID: TimelineItemIdentifier)
case presentRoom(roomID: String)
case presentRoom(roomID: String, via: [String])
}
final class RoomScreenCoordinator: CoordinatorProtocol {
@@ -148,8 +148,8 @@ final class RoomScreenCoordinator: CoordinatorProtocol {
composerViewModel.process(timelineAction: action)
case .hasScrolled(direction: let direction):
roomViewModel.timelineHasScrolled(direction: direction)
case .displayRoom(let roomID):
actionsSubject.send(.presentRoom(roomID: roomID))
case .displayRoom(let roomID, let via):
actionsSubject.send(.presentRoom(roomID: roomID, via: via))
case .viewInRoomTimeline:
fatalError("The action: \(action) should not be sent to this coordinator")
}
@@ -181,8 +181,8 @@ final class RoomScreenCoordinator: CoordinatorProtocol {
composerViewModel.process(timelineAction: .removeFocus)
case .displayKnockRequests:
actionsSubject.send(.presentKnockRequestsList)
case .displayRoom(let roomID):
actionsSubject.send(.presentRoom(roomID: roomID))
case .displayRoom(let roomID, let via):
actionsSubject.send(.presentRoom(roomID: roomID, via: via))
}
}
.store(in: &cancellables)
ElementX/Sources/Screens/RoomScreen/RoomScreenModels.swift
+1 -1
View File
@@ -15,7 +15,7 @@ enum RoomScreenViewModelAction: Equatable {
case displayCall
case removeComposerFocus
case displayKnockRequests
case displayRoom(roomID: String)
case displayRoom(roomID: String, via: [String])
}
enum RoomScreenViewAction {
ElementX/Sources/Screens/RoomScreen/RoomScreenViewModel.swift
+3 -1
View File
@@ -5,6 +5,7 @@
// Please see LICENSE files in the repository root for full details.
//
import Algorithms
import Combine
import Foundation
import MatrixRustSDK
@@ -117,7 +118,8 @@ class RoomScreenViewModel: RoomScreenViewModelType, RoomScreenViewModelProtocol
actionsSubject.send(.displayKnockRequests)
case .displaySuccessorRoom:
guard let successorID = roomProxy.infoPublisher.value.successor?.roomId else { return }
actionsSubject.send(.displayRoom(roomID: successorID))
let serverNames = roomProxy.knownServerNames(maxCount: 50) // Limit to the same number used by ClientProxy.resolveRoomAlias(_:)
actionsSubject.send(.displayRoom(roomID: successorID, via: Array(serverNames)))
}
}