Skip to content

Commit 88e63b2

Browse files
committed
Bump the RustSDK to v25.01.22 and use the new timeline building API
1 parent 3162bf7 commit 88e63b2

File tree

5 files changed

+52
-191
lines changed

5 files changed

+52
-191
lines changed

ElementX.xcodeproj/project.pbxproj

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1365,6 +1365,7 @@
13651365
04DF593C3F7AF4B2FBAEB05D /* FileManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FileManager.swift; sourceTree = "<group>"; };
13661366
0516C69708D5CBDE1A8E77EC /* RoomDirectorySearchProxyProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RoomDirectorySearchProxyProtocol.swift; sourceTree = "<group>"; };
13671367
052B2F924572AFD70B5F500E /* StartChatScreenViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StartChatScreenViewModel.swift; sourceTree = "<group>"; };
1368+
0545AC444BEEA89FF8C509FD /* zh-Hant-TW */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hant-TW"; path = "zh-Hant-TW.lproj/InfoPlist.strings"; sourceTree = "<group>"; };
13681369
054F469E433864CC6FE6EE8E /* ServerSelectionUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ServerSelectionUITests.swift; sourceTree = "<group>"; };
13691370
05512FB13987D221B7205DE0 /* HomeScreenRecoveryKeyConfirmationBanner.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeScreenRecoveryKeyConfirmationBanner.swift; sourceTree = "<group>"; };
13701371
0554FEA301486A8CFA475D5A /* AuthenticationClientBuilderFactoryMock.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AuthenticationClientBuilderFactoryMock.swift; sourceTree = "<group>"; };
@@ -7880,6 +7881,7 @@
78807881
969694F67E844FCA51F7E051 /* sv */,
78817882
D66B5D86A9AB95E0E01BED82 /* uk */,
78827883
FF720BA68256297680980481 /* zh-Hans */,
7884+
0545AC444BEEA89FF8C509FD /* zh-Hant-TW */,
78837885
);
78847886
name = InfoPlist.strings;
78857887
sourceTree = "<group>";
@@ -8498,7 +8500,7 @@
84988500
repositoryURL = "https://github.com/element-hq/matrix-rust-components-swift";
84998501
requirement = {
85008502
kind = exactVersion;
8501-
version = 25.01.15;
8503+
version = 25.01.22;
85028504
};
85038505
};
85048506
701C7BEF8F70F7A83E852DCC /* XCRemoteSwiftPackageReference "GZIP" */ = {

ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ElementX/Sources/Mocks/Generated/SDKGeneratedMocks.swift

Lines changed: 27 additions & 177 deletions
Original file line numberDiff line numberDiff line change
@@ -13237,81 +13237,6 @@ open class RoomSDKMock: MatrixRustSDK.Room, @unchecked Sendable {
1323713237
}
1323813238
}
1323913239

13240-
//MARK: - messageFilteredTimeline
13241-
13242-
open var messageFilteredTimelineInternalIdPrefixAllowedMessageTypesDateDividerModeThrowableError: Error?
13243-
var messageFilteredTimelineInternalIdPrefixAllowedMessageTypesDateDividerModeUnderlyingCallsCount = 0
13244-
open var messageFilteredTimelineInternalIdPrefixAllowedMessageTypesDateDividerModeCallsCount: Int {
13245-
get {
13246-
if Thread.isMainThread {
13247-
return messageFilteredTimelineInternalIdPrefixAllowedMessageTypesDateDividerModeUnderlyingCallsCount
13248-
} else {
13249-
var returnValue: Int? = nil
13250-
DispatchQueue.main.sync {
13251-
returnValue = messageFilteredTimelineInternalIdPrefixAllowedMessageTypesDateDividerModeUnderlyingCallsCount
13252-
}
13253-
13254-
return returnValue!
13255-
}
13256-
}
13257-
set {
13258-
if Thread.isMainThread {
13259-
messageFilteredTimelineInternalIdPrefixAllowedMessageTypesDateDividerModeUnderlyingCallsCount = newValue
13260-
} else {
13261-
DispatchQueue.main.sync {
13262-
messageFilteredTimelineInternalIdPrefixAllowedMessageTypesDateDividerModeUnderlyingCallsCount = newValue
13263-
}
13264-
}
13265-
}
13266-
}
13267-
open var messageFilteredTimelineInternalIdPrefixAllowedMessageTypesDateDividerModeCalled: Bool {
13268-
return messageFilteredTimelineInternalIdPrefixAllowedMessageTypesDateDividerModeCallsCount > 0
13269-
}
13270-
open var messageFilteredTimelineInternalIdPrefixAllowedMessageTypesDateDividerModeReceivedArguments: (internalIdPrefix: String?, allowedMessageTypes: [RoomMessageEventMessageType], dateDividerMode: DateDividerMode)?
13271-
open var messageFilteredTimelineInternalIdPrefixAllowedMessageTypesDateDividerModeReceivedInvocations: [(internalIdPrefix: String?, allowedMessageTypes: [RoomMessageEventMessageType], dateDividerMode: DateDividerMode)] = []
13272-
13273-
var messageFilteredTimelineInternalIdPrefixAllowedMessageTypesDateDividerModeUnderlyingReturnValue: Timeline!
13274-
open var messageFilteredTimelineInternalIdPrefixAllowedMessageTypesDateDividerModeReturnValue: Timeline! {
13275-
get {
13276-
if Thread.isMainThread {
13277-
return messageFilteredTimelineInternalIdPrefixAllowedMessageTypesDateDividerModeUnderlyingReturnValue
13278-
} else {
13279-
var returnValue: Timeline? = nil
13280-
DispatchQueue.main.sync {
13281-
returnValue = messageFilteredTimelineInternalIdPrefixAllowedMessageTypesDateDividerModeUnderlyingReturnValue
13282-
}
13283-
13284-
return returnValue!
13285-
}
13286-
}
13287-
set {
13288-
if Thread.isMainThread {
13289-
messageFilteredTimelineInternalIdPrefixAllowedMessageTypesDateDividerModeUnderlyingReturnValue = newValue
13290-
} else {
13291-
DispatchQueue.main.sync {
13292-
messageFilteredTimelineInternalIdPrefixAllowedMessageTypesDateDividerModeUnderlyingReturnValue = newValue
13293-
}
13294-
}
13295-
}
13296-
}
13297-
open var messageFilteredTimelineInternalIdPrefixAllowedMessageTypesDateDividerModeClosure: ((String?, [RoomMessageEventMessageType], DateDividerMode) async throws -> Timeline)?
13298-
13299-
open override func messageFilteredTimeline(internalIdPrefix: String?, allowedMessageTypes: [RoomMessageEventMessageType], dateDividerMode: DateDividerMode) async throws -> Timeline {
13300-
if let error = messageFilteredTimelineInternalIdPrefixAllowedMessageTypesDateDividerModeThrowableError {
13301-
throw error
13302-
}
13303-
messageFilteredTimelineInternalIdPrefixAllowedMessageTypesDateDividerModeCallsCount += 1
13304-
messageFilteredTimelineInternalIdPrefixAllowedMessageTypesDateDividerModeReceivedArguments = (internalIdPrefix: internalIdPrefix, allowedMessageTypes: allowedMessageTypes, dateDividerMode: dateDividerMode)
13305-
DispatchQueue.main.async {
13306-
self.messageFilteredTimelineInternalIdPrefixAllowedMessageTypesDateDividerModeReceivedInvocations.append((internalIdPrefix: internalIdPrefix, allowedMessageTypes: allowedMessageTypes, dateDividerMode: dateDividerMode))
13307-
}
13308-
if let messageFilteredTimelineInternalIdPrefixAllowedMessageTypesDateDividerModeClosure = messageFilteredTimelineInternalIdPrefixAllowedMessageTypesDateDividerModeClosure {
13309-
return try await messageFilteredTimelineInternalIdPrefixAllowedMessageTypesDateDividerModeClosure(internalIdPrefix, allowedMessageTypes, dateDividerMode)
13310-
} else {
13311-
return messageFilteredTimelineInternalIdPrefixAllowedMessageTypesDateDividerModeReturnValue
13312-
}
13313-
}
13314-
1331513240
//MARK: - ownUserId
1331613241

1331713242
var ownUserIdUnderlyingCallsCount = 0
@@ -13377,81 +13302,6 @@ open class RoomSDKMock: MatrixRustSDK.Room, @unchecked Sendable {
1337713302
}
1337813303
}
1337913304

13380-
//MARK: - pinnedEventsTimeline
13381-
13382-
open var pinnedEventsTimelineInternalIdPrefixMaxEventsToLoadMaxConcurrentRequestsThrowableError: Error?
13383-
var pinnedEventsTimelineInternalIdPrefixMaxEventsToLoadMaxConcurrentRequestsUnderlyingCallsCount = 0
13384-
open var pinnedEventsTimelineInternalIdPrefixMaxEventsToLoadMaxConcurrentRequestsCallsCount: Int {
13385-
get {
13386-
if Thread.isMainThread {
13387-
return pinnedEventsTimelineInternalIdPrefixMaxEventsToLoadMaxConcurrentRequestsUnderlyingCallsCount
13388-
} else {
13389-
var returnValue: Int? = nil
13390-
DispatchQueue.main.sync {
13391-
returnValue = pinnedEventsTimelineInternalIdPrefixMaxEventsToLoadMaxConcurrentRequestsUnderlyingCallsCount
13392-
}
13393-
13394-
return returnValue!
13395-
}
13396-
}
13397-
set {
13398-
if Thread.isMainThread {
13399-
pinnedEventsTimelineInternalIdPrefixMaxEventsToLoadMaxConcurrentRequestsUnderlyingCallsCount = newValue
13400-
} else {
13401-
DispatchQueue.main.sync {
13402-
pinnedEventsTimelineInternalIdPrefixMaxEventsToLoadMaxConcurrentRequestsUnderlyingCallsCount = newValue
13403-
}
13404-
}
13405-
}
13406-
}
13407-
open var pinnedEventsTimelineInternalIdPrefixMaxEventsToLoadMaxConcurrentRequestsCalled: Bool {
13408-
return pinnedEventsTimelineInternalIdPrefixMaxEventsToLoadMaxConcurrentRequestsCallsCount > 0
13409-
}
13410-
open var pinnedEventsTimelineInternalIdPrefixMaxEventsToLoadMaxConcurrentRequestsReceivedArguments: (internalIdPrefix: String?, maxEventsToLoad: UInt16, maxConcurrentRequests: UInt16)?
13411-
open var pinnedEventsTimelineInternalIdPrefixMaxEventsToLoadMaxConcurrentRequestsReceivedInvocations: [(internalIdPrefix: String?, maxEventsToLoad: UInt16, maxConcurrentRequests: UInt16)] = []
13412-
13413-
var pinnedEventsTimelineInternalIdPrefixMaxEventsToLoadMaxConcurrentRequestsUnderlyingReturnValue: Timeline!
13414-
open var pinnedEventsTimelineInternalIdPrefixMaxEventsToLoadMaxConcurrentRequestsReturnValue: Timeline! {
13415-
get {
13416-
if Thread.isMainThread {
13417-
return pinnedEventsTimelineInternalIdPrefixMaxEventsToLoadMaxConcurrentRequestsUnderlyingReturnValue
13418-
} else {
13419-
var returnValue: Timeline? = nil
13420-
DispatchQueue.main.sync {
13421-
returnValue = pinnedEventsTimelineInternalIdPrefixMaxEventsToLoadMaxConcurrentRequestsUnderlyingReturnValue
13422-
}
13423-
13424-
return returnValue!
13425-
}
13426-
}
13427-
set {
13428-
if Thread.isMainThread {
13429-
pinnedEventsTimelineInternalIdPrefixMaxEventsToLoadMaxConcurrentRequestsUnderlyingReturnValue = newValue
13430-
} else {
13431-
DispatchQueue.main.sync {
13432-
pinnedEventsTimelineInternalIdPrefixMaxEventsToLoadMaxConcurrentRequestsUnderlyingReturnValue = newValue
13433-
}
13434-
}
13435-
}
13436-
}
13437-
open var pinnedEventsTimelineInternalIdPrefixMaxEventsToLoadMaxConcurrentRequestsClosure: ((String?, UInt16, UInt16) async throws -> Timeline)?
13438-
13439-
open override func pinnedEventsTimeline(internalIdPrefix: String?, maxEventsToLoad: UInt16, maxConcurrentRequests: UInt16) async throws -> Timeline {
13440-
if let error = pinnedEventsTimelineInternalIdPrefixMaxEventsToLoadMaxConcurrentRequestsThrowableError {
13441-
throw error
13442-
}
13443-
pinnedEventsTimelineInternalIdPrefixMaxEventsToLoadMaxConcurrentRequestsCallsCount += 1
13444-
pinnedEventsTimelineInternalIdPrefixMaxEventsToLoadMaxConcurrentRequestsReceivedArguments = (internalIdPrefix: internalIdPrefix, maxEventsToLoad: maxEventsToLoad, maxConcurrentRequests: maxConcurrentRequests)
13445-
DispatchQueue.main.async {
13446-
self.pinnedEventsTimelineInternalIdPrefixMaxEventsToLoadMaxConcurrentRequestsReceivedInvocations.append((internalIdPrefix: internalIdPrefix, maxEventsToLoad: maxEventsToLoad, maxConcurrentRequests: maxConcurrentRequests))
13447-
}
13448-
if let pinnedEventsTimelineInternalIdPrefixMaxEventsToLoadMaxConcurrentRequestsClosure = pinnedEventsTimelineInternalIdPrefixMaxEventsToLoadMaxConcurrentRequestsClosure {
13449-
return try await pinnedEventsTimelineInternalIdPrefixMaxEventsToLoadMaxConcurrentRequestsClosure(internalIdPrefix, maxEventsToLoad, maxConcurrentRequests)
13450-
} else {
13451-
return pinnedEventsTimelineInternalIdPrefixMaxEventsToLoadMaxConcurrentRequestsReturnValue
13452-
}
13453-
}
13454-
1345513305
//MARK: - publishRoomAliasInRoomDirectory
1345613306

1345713307
open var publishRoomAliasInRoomDirectoryAliasThrowableError: Error?
@@ -14846,78 +14696,78 @@ open class RoomSDKMock: MatrixRustSDK.Room, @unchecked Sendable {
1484614696
}
1484714697
}
1484814698

14849-
//MARK: - timelineFocusedOnEvent
14699+
//MARK: - timelineWithConfiguration
1485014700

14851-
open var timelineFocusedOnEventEventIdNumContextEventsInternalIdPrefixThrowableError: Error?
14852-
var timelineFocusedOnEventEventIdNumContextEventsInternalIdPrefixUnderlyingCallsCount = 0
14853-
open var timelineFocusedOnEventEventIdNumContextEventsInternalIdPrefixCallsCount: Int {
14701+
open var timelineWithConfigurationConfigurationThrowableError: Error?
14702+
var timelineWithConfigurationConfigurationUnderlyingCallsCount = 0
14703+
open var timelineWithConfigurationConfigurationCallsCount: Int {
1485414704
get {
1485514705
if Thread.isMainThread {
14856-
return timelineFocusedOnEventEventIdNumContextEventsInternalIdPrefixUnderlyingCallsCount
14706+
return timelineWithConfigurationConfigurationUnderlyingCallsCount
1485714707
} else {
1485814708
var returnValue: Int? = nil
1485914709
DispatchQueue.main.sync {
14860-
returnValue = timelineFocusedOnEventEventIdNumContextEventsInternalIdPrefixUnderlyingCallsCount
14710+
returnValue = timelineWithConfigurationConfigurationUnderlyingCallsCount
1486114711
}
1486214712

1486314713
return returnValue!
1486414714
}
1486514715
}
1486614716
set {
1486714717
if Thread.isMainThread {
14868-
timelineFocusedOnEventEventIdNumContextEventsInternalIdPrefixUnderlyingCallsCount = newValue
14718+
timelineWithConfigurationConfigurationUnderlyingCallsCount = newValue
1486914719
} else {
1487014720
DispatchQueue.main.sync {
14871-
timelineFocusedOnEventEventIdNumContextEventsInternalIdPrefixUnderlyingCallsCount = newValue
14721+
timelineWithConfigurationConfigurationUnderlyingCallsCount = newValue
1487214722
}
1487314723
}
1487414724
}
1487514725
}
14876-
open var timelineFocusedOnEventEventIdNumContextEventsInternalIdPrefixCalled: Bool {
14877-
return timelineFocusedOnEventEventIdNumContextEventsInternalIdPrefixCallsCount > 0
14726+
open var timelineWithConfigurationConfigurationCalled: Bool {
14727+
return timelineWithConfigurationConfigurationCallsCount > 0
1487814728
}
14879-
open var timelineFocusedOnEventEventIdNumContextEventsInternalIdPrefixReceivedArguments: (eventId: String, numContextEvents: UInt16, internalIdPrefix: String?)?
14880-
open var timelineFocusedOnEventEventIdNumContextEventsInternalIdPrefixReceivedInvocations: [(eventId: String, numContextEvents: UInt16, internalIdPrefix: String?)] = []
14729+
open var timelineWithConfigurationConfigurationReceivedConfiguration: TimelineConfiguration?
14730+
open var timelineWithConfigurationConfigurationReceivedInvocations: [TimelineConfiguration] = []
1488114731

14882-
var timelineFocusedOnEventEventIdNumContextEventsInternalIdPrefixUnderlyingReturnValue: Timeline!
14883-
open var timelineFocusedOnEventEventIdNumContextEventsInternalIdPrefixReturnValue: Timeline! {
14732+
var timelineWithConfigurationConfigurationUnderlyingReturnValue: Timeline!
14733+
open var timelineWithConfigurationConfigurationReturnValue: Timeline! {
1488414734
get {
1488514735
if Thread.isMainThread {
14886-
return timelineFocusedOnEventEventIdNumContextEventsInternalIdPrefixUnderlyingReturnValue
14736+
return timelineWithConfigurationConfigurationUnderlyingReturnValue
1488714737
} else {
1488814738
var returnValue: Timeline? = nil
1488914739
DispatchQueue.main.sync {
14890-
returnValue = timelineFocusedOnEventEventIdNumContextEventsInternalIdPrefixUnderlyingReturnValue
14740+
returnValue = timelineWithConfigurationConfigurationUnderlyingReturnValue
1489114741
}
1489214742

1489314743
return returnValue!
1489414744
}
1489514745
}
1489614746
set {
1489714747
if Thread.isMainThread {
14898-
timelineFocusedOnEventEventIdNumContextEventsInternalIdPrefixUnderlyingReturnValue = newValue
14748+
timelineWithConfigurationConfigurationUnderlyingReturnValue = newValue
1489914749
} else {
1490014750
DispatchQueue.main.sync {
14901-
timelineFocusedOnEventEventIdNumContextEventsInternalIdPrefixUnderlyingReturnValue = newValue
14751+
timelineWithConfigurationConfigurationUnderlyingReturnValue = newValue
1490214752
}
1490314753
}
1490414754
}
1490514755
}
14906-
open var timelineFocusedOnEventEventIdNumContextEventsInternalIdPrefixClosure: ((String, UInt16, String?) async throws -> Timeline)?
14756+
open var timelineWithConfigurationConfigurationClosure: ((TimelineConfiguration) async throws -> Timeline)?
1490714757

14908-
open override func timelineFocusedOnEvent(eventId: String, numContextEvents: UInt16, internalIdPrefix: String?) async throws -> Timeline {
14909-
if let error = timelineFocusedOnEventEventIdNumContextEventsInternalIdPrefixThrowableError {
14758+
open override func timelineWithConfiguration(configuration: TimelineConfiguration) async throws -> Timeline {
14759+
if let error = timelineWithConfigurationConfigurationThrowableError {
1491014760
throw error
1491114761
}
14912-
timelineFocusedOnEventEventIdNumContextEventsInternalIdPrefixCallsCount += 1
14913-
timelineFocusedOnEventEventIdNumContextEventsInternalIdPrefixReceivedArguments = (eventId: eventId, numContextEvents: numContextEvents, internalIdPrefix: internalIdPrefix)
14762+
timelineWithConfigurationConfigurationCallsCount += 1
14763+
timelineWithConfigurationConfigurationReceivedConfiguration = configuration
1491414764
DispatchQueue.main.async {
14915-
self.timelineFocusedOnEventEventIdNumContextEventsInternalIdPrefixReceivedInvocations.append((eventId: eventId, numContextEvents: numContextEvents, internalIdPrefix: internalIdPrefix))
14765+
self.timelineWithConfigurationConfigurationReceivedInvocations.append(configuration)
1491614766
}
14917-
if let timelineFocusedOnEventEventIdNumContextEventsInternalIdPrefixClosure = timelineFocusedOnEventEventIdNumContextEventsInternalIdPrefixClosure {
14918-
return try await timelineFocusedOnEventEventIdNumContextEventsInternalIdPrefixClosure(eventId, numContextEvents, internalIdPrefix)
14767+
if let timelineWithConfigurationConfigurationClosure = timelineWithConfigurationConfigurationClosure {
14768+
return try await timelineWithConfigurationConfigurationClosure(configuration)
1491914769
} else {
14920-
return timelineFocusedOnEventEventIdNumContextEventsInternalIdPrefixReturnValue
14770+
return timelineWithConfigurationConfigurationReturnValue
1492114771
}
1492214772
}
1492314773

0 commit comments

Comments
 (0)