Skip to content

Commit 1490877

Browse files
committed
Bump to version 25.11.27 (matrix-rust-sdk/main 73449f4f57e4185c95ee69cf9f3e41d9a0e0857e)
1 parent 05f951f commit 1490877

File tree

3 files changed

+105
-21
lines changed

3 files changed

+105
-21
lines changed

Package.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
// swift-tools-version:5.9
22
// The swift-tools-version declares the minimum version of Swift required to build this package.
33
import PackageDescription
4-
let checksum = "dcf5d49efd0629b44b1fd46148f51174a6baccff459d2f15226a457126f3e8be"
5-
let version = "25.11.24"
4+
let checksum = "ad32c33340590b5a4517dbff6bec64ed76f29a22271eb8e79da6dac5b5559ef8"
5+
let version = "25.11.27"
66
let url = "https://github.com/element-hq/matrix-rust-components-swift/releases/download/\(version)/MatrixSDKFFI.xcframework.zip"
77
let package = Package(
88
name: "MatrixRustSDK",

Sources/MatrixRustSDK/matrix_sdk.swift

Lines changed: 23 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1840,6 +1840,11 @@ public enum QrCodeLoginError: Swift.Error, Equatable, Hashable, Foundation.Local
18401840
*/
18411841
case SecureChannel(message: String)
18421842

1843+
/**
1844+
* The rendezvous session was not found and might have expired.
1845+
*/
1846+
case NotFound(message: String)
1847+
18431848
/**
18441849
* The cross-process refresh lock failed to be initialized.
18451850
*/
@@ -1918,27 +1923,31 @@ public struct FfiConverterTypeQRCodeLoginError: FfiConverterRustBuffer {
19181923
message: try FfiConverterString.read(from: &buf)
19191924
)
19201925

1921-
case 5: return .CrossProcessRefreshLock(
1926+
case 5: return .NotFound(
19221927
message: try FfiConverterString.read(from: &buf)
19231928
)
19241929

1925-
case 6: return .UserIdDiscovery(
1930+
case 6: return .CrossProcessRefreshLock(
19261931
message: try FfiConverterString.read(from: &buf)
19271932
)
19281933

1929-
case 7: return .SessionTokens(
1934+
case 7: return .UserIdDiscovery(
19301935
message: try FfiConverterString.read(from: &buf)
19311936
)
19321937

1933-
case 8: return .DeviceKeyUpload(
1938+
case 8: return .SessionTokens(
19341939
message: try FfiConverterString.read(from: &buf)
19351940
)
19361941

1937-
case 9: return .SecretImport(
1942+
case 9: return .DeviceKeyUpload(
19381943
message: try FfiConverterString.read(from: &buf)
19391944
)
19401945

1941-
case 10: return .ServerReset(
1946+
case 10: return .SecretImport(
1947+
message: try FfiConverterString.read(from: &buf)
1948+
)
1949+
1950+
case 11: return .ServerReset(
19421951
message: try FfiConverterString.read(from: &buf)
19431952
)
19441953

@@ -1961,18 +1970,20 @@ public struct FfiConverterTypeQRCodeLoginError: FfiConverterRustBuffer {
19611970
writeInt(&buf, Int32(3))
19621971
case .SecureChannel(_ /* message is ignored*/):
19631972
writeInt(&buf, Int32(4))
1964-
case .CrossProcessRefreshLock(_ /* message is ignored*/):
1973+
case .NotFound(_ /* message is ignored*/):
19651974
writeInt(&buf, Int32(5))
1966-
case .UserIdDiscovery(_ /* message is ignored*/):
1975+
case .CrossProcessRefreshLock(_ /* message is ignored*/):
19671976
writeInt(&buf, Int32(6))
1968-
case .SessionTokens(_ /* message is ignored*/):
1977+
case .UserIdDiscovery(_ /* message is ignored*/):
19691978
writeInt(&buf, Int32(7))
1970-
case .DeviceKeyUpload(_ /* message is ignored*/):
1979+
case .SessionTokens(_ /* message is ignored*/):
19711980
writeInt(&buf, Int32(8))
1972-
case .SecretImport(_ /* message is ignored*/):
1981+
case .DeviceKeyUpload(_ /* message is ignored*/):
19731982
writeInt(&buf, Int32(9))
1974-
case .ServerReset(_ /* message is ignored*/):
1983+
case .SecretImport(_ /* message is ignored*/):
19751984
writeInt(&buf, Int32(10))
1985+
case .ServerReset(_ /* message is ignored*/):
1986+
writeInt(&buf, Int32(11))
19761987

19771988

19781989
}

Sources/MatrixRustSDK/matrix_sdk_ffi.swift

Lines changed: 80 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12678,6 +12678,15 @@ public protocol SpaceServiceProtocol: AnyObject, Sendable {
1267812678

1267912679
func addChildToSpace(childId: String, spaceId: String) async throws
1268012680

12681+
/**
12682+
* Returns a flattened list containing all the spaces where the user has
12683+
* permission to send `m.space.child` state events.
12684+
*
12685+
* Note: Unlike [`Self::joined_spaces()`], this method does not recompute
12686+
* the space graph, nor does it notify subscribers about changes.
12687+
*/
12688+
func editableSpaces() async -> [SpaceRoom]
12689+
1268112690
/**
1268212691
* Returns all known direct-parents of a given space room ID.
1268312692
*/
@@ -12788,6 +12797,31 @@ open func addChildToSpace(childId: String, spaceId: String)async throws {
1278812797
)
1278912798
}
1279012799

12800+
/**
12801+
* Returns a flattened list containing all the spaces where the user has
12802+
* permission to send `m.space.child` state events.
12803+
*
12804+
* Note: Unlike [`Self::joined_spaces()`], this method does not recompute
12805+
* the space graph, nor does it notify subscribers about changes.
12806+
*/
12807+
open func editableSpaces()async -> [SpaceRoom] {
12808+
return
12809+
try! await uniffiRustCallAsync(
12810+
rustFutureFunc: {
12811+
uniffi_matrix_sdk_ffi_fn_method_spaceservice_editable_spaces(
12812+
self.uniffiCloneHandle()
12813+
12814+
)
12815+
},
12816+
pollFunc: ffi_matrix_sdk_ffi_rust_future_poll_rust_buffer,
12817+
completeFunc: ffi_matrix_sdk_ffi_rust_future_complete_rust_buffer,
12818+
freeFunc: ffi_matrix_sdk_ffi_rust_future_free_rust_buffer,
12819+
liftFunc: FfiConverterSequenceTypeSpaceRoom.lift,
12820+
errorHandler: nil
12821+
12822+
)
12823+
}
12824+
1279112825
/**
1279212826
* Returns all known direct-parents of a given space room ID.
1279312827
*/
@@ -13040,15 +13074,16 @@ open class Span: SpanProtocol, @unchecked Sendable {
1304013074
* unless you *want* the span to be attached to all further events created
1304113075
* on that thread.
1304213076
*/
13043-
public convenience init(file: String, line: UInt32?, level: LogLevel, target: String, name: String) {
13077+
public convenience init(file: String, line: UInt32?, level: LogLevel, target: String, name: String, bridgeTraceId: String?) {
1304413078
let handle =
1304513079
try! rustCall() {
1304613080
uniffi_matrix_sdk_ffi_fn_constructor_span_new(
1304713081
FfiConverterString.lower(file),
1304813082
FfiConverterOptionUInt32.lower(line),
1304913083
FfiConverterTypeLogLevel_lower(level),
1305013084
FfiConverterString.lower(target),
13051-
FfiConverterString.lower(name),$0
13085+
FfiConverterString.lower(name),
13086+
FfiConverterOptionString.lower(bridgeTraceId),$0
1305213087
)
1305313088
}
1305413089
self.init(unsafeFromHandle: handle)
@@ -13067,6 +13102,21 @@ public static func current() -> Span {
1306713102
})
1306813103
}
1306913104

13105+
/**
13106+
* Creates a [`Span`] that acts as a bridge between the client spans and
13107+
* the SDK ones, allowing them to be joined in Sentry. This function
13108+
* will only return a valid span if the `sentry` feature is enabled,
13109+
* otherwise it will return a noop span.
13110+
*/
13111+
public static func newBridgeSpan(target: String, parentTraceId: String?) -> Span {
13112+
return try! FfiConverterTypeSpan_lift(try! rustCall() {
13113+
uniffi_matrix_sdk_ffi_fn_constructor_span_new_bridge_span(
13114+
FfiConverterString.lower(target),
13115+
FfiConverterOptionString.lower(parentTraceId),$0
13116+
)
13117+
})
13118+
}
13119+
1307013120

1307113121

1307213122
open func enter() {try! rustCall() {
@@ -27076,6 +27126,11 @@ public enum HumanQrGrantLoginError: Swift.Error, Equatable, Hashable, Foundation
2707627126
*/
2707727127
case MissingSecretsBackup(message: String)
2707827128

27129+
/**
27130+
* The rendezvous session was not found and might have expired.
27131+
*/
27132+
case NotFound(message: String)
27133+
2707927134
/**
2708027135
* The device could not be created.
2708127136
*/
@@ -27129,11 +27184,15 @@ public struct FfiConverterTypeHumanQrGrantLoginError: FfiConverterRustBuffer {
2712927184
message: try FfiConverterString.read(from: &buf)
2713027185
)
2713127186

27132-
case 5: return .UnableToCreateDevice(
27187+
case 5: return .NotFound(
27188+
message: try FfiConverterString.read(from: &buf)
27189+
)
27190+
27191+
case 6: return .UnableToCreateDevice(
2713327192
message: try FfiConverterString.read(from: &buf)
2713427193
)
2713527194

27136-
case 6: return .Unknown(
27195+
case 7: return .Unknown(
2713727196
message: try FfiConverterString.read(from: &buf)
2713827197
)
2713927198

@@ -27156,10 +27215,12 @@ public struct FfiConverterTypeHumanQrGrantLoginError: FfiConverterRustBuffer {
2715627215
writeInt(&buf, Int32(3))
2715727216
case .MissingSecretsBackup(_ /* message is ignored*/):
2715827217
writeInt(&buf, Int32(4))
27159-
case .UnableToCreateDevice(_ /* message is ignored*/):
27218+
case .NotFound(_ /* message is ignored*/):
2716027219
writeInt(&buf, Int32(5))
27161-
case .Unknown(_ /* message is ignored*/):
27220+
case .UnableToCreateDevice(_ /* message is ignored*/):
2716227221
writeInt(&buf, Int32(6))
27222+
case .Unknown(_ /* message is ignored*/):
27223+
writeInt(&buf, Int32(7))
2716327224

2716427225

2716527226
}
@@ -27197,6 +27258,7 @@ public enum HumanQrLoginError: Swift.Error, Equatable, Hashable, Foundation.Loca
2719727258
case OtherDeviceNotSignedIn
2719827259
case CheckCodeAlreadySent
2719927260
case CheckCodeCannotBeSent
27261+
case NotFound
2720027262

2720127263

2720227264

@@ -27235,6 +27297,7 @@ public struct FfiConverterTypeHumanQrLoginError: FfiConverterRustBuffer {
2723527297
case 9: return .OtherDeviceNotSignedIn
2723627298
case 10: return .CheckCodeAlreadySent
2723727299
case 11: return .CheckCodeCannotBeSent
27300+
case 12: return .NotFound
2723827301

2723927302
default: throw UniffiInternalError.unexpectedEnumCase
2724027303
}
@@ -27290,6 +27353,10 @@ public struct FfiConverterTypeHumanQrLoginError: FfiConverterRustBuffer {
2729027353
case .CheckCodeCannotBeSent:
2729127354
writeInt(&buf, Int32(11))
2729227355

27356+
27357+
case .NotFound:
27358+
writeInt(&buf, Int32(12))
27359+
2729327360
}
2729427361
}
2729527362
}
@@ -46275,6 +46342,9 @@ private let initializationResult: InitializationResult = {
4627546342
if (uniffi_matrix_sdk_ffi_checksum_method_spaceservice_add_child_to_space() != 31295) {
4627646343
return InitializationResult.apiChecksumMismatch
4627746344
}
46345+
if (uniffi_matrix_sdk_ffi_checksum_method_spaceservice_editable_spaces() != 62969) {
46346+
return InitializationResult.apiChecksumMismatch
46347+
}
4627846348
if (uniffi_matrix_sdk_ffi_checksum_method_spaceservice_joined_parents_of_child() != 18724) {
4627946349
return InitializationResult.apiChecksumMismatch
4628046350
}
@@ -46530,7 +46600,10 @@ private let initializationResult: InitializationResult = {
4653046600
if (uniffi_matrix_sdk_ffi_checksum_constructor_span_current() != 53698) {
4653146601
return InitializationResult.apiChecksumMismatch
4653246602
}
46533-
if (uniffi_matrix_sdk_ffi_checksum_constructor_span_new() != 14105) {
46603+
if (uniffi_matrix_sdk_ffi_checksum_constructor_span_new() != 8957) {
46604+
return InitializationResult.apiChecksumMismatch
46605+
}
46606+
if (uniffi_matrix_sdk_ffi_checksum_constructor_span_new_bridge_span() != 63835) {
4653446607
return InitializationResult.apiChecksumMismatch
4653546608
}
4653646609
if (uniffi_matrix_sdk_ffi_checksum_constructor_sqlitestorebuilder_new() != 51363) {

0 commit comments

Comments
 (0)