Skip to content

Commit

Permalink
Bump to v1.1.27 (matrix-rust-sdk/main d8c02d7e55bbba78d2725a29bdcd62f…
Browse files Browse the repository at this point in the history 
…0dd179e08)
  • Loading branch information
@pixlwave
pixlwave committed Dec 1, 2023
1 parent d8588b9 commit 3e35994
Show file tree
Hide file tree
Showing 2 changed files with 107 additions and 31 deletions.
4 changes: 2 additions & 2 deletions Package.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@

import PackageDescription

let checksum = "6f75dc480063cf0cab70d47d307cb73358865552497488e5c6c55a1b95269dee"
let version = "v0.0.7-november23"
let checksum = "9ab313694b9196f71ee07c6b72f9f4ea1391f408cad725de0445c031dc94b2b1"
let version = "v1.1.27"
let url = "https://github.com/matrix-org/matrix-rust-components-swift/releases/download/\(version)/MatrixSDKFFI.xcframework.zip"

let package = Package(
Expand Down
134 changes: 105 additions & 29 deletions Sources/MatrixRustSDK/matrix_sdk_ffi.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1439,7 +1439,7 @@ public class Encryption:
completeFunc: ffi_matrix_sdk_ffi_rust_future_complete_void,
freeFunc: ffi_matrix_sdk_ffi_rust_future_free_void,
liftFunc: { $0 },
errorHandler: FfiConverterTypeClientError.lift
errorHandler: FfiConverterTypeRecoveryError.lift
)
}

Expand All @@ -1456,7 +1456,7 @@ public class Encryption:
completeFunc: ffi_matrix_sdk_ffi_rust_future_complete_void,
freeFunc: ffi_matrix_sdk_ffi_rust_future_free_void,
liftFunc: { $0 },
errorHandler: FfiConverterTypeClientError.lift
errorHandler: FfiConverterTypeRecoveryError.lift
)
}

Expand All @@ -1475,7 +1475,7 @@ public class Encryption:
completeFunc: ffi_matrix_sdk_ffi_rust_future_complete_rust_buffer,
freeFunc: ffi_matrix_sdk_ffi_rust_future_free_rust_buffer,
liftFunc: FfiConverterString.lift,
errorHandler: FfiConverterTypeClientError.lift
errorHandler: FfiConverterTypeRecoveryError.lift
)
}

Expand All @@ -1492,7 +1492,7 @@ public class Encryption:
completeFunc: ffi_matrix_sdk_ffi_rust_future_complete_i8,
freeFunc: ffi_matrix_sdk_ffi_rust_future_free_i8,
liftFunc: FfiConverterBool.lift,
errorHandler: FfiConverterTypeClientError.lift
errorHandler: FfiConverterTypeRecoveryError.lift
)
}

Expand All @@ -1510,7 +1510,7 @@ public class Encryption:
completeFunc: ffi_matrix_sdk_ffi_rust_future_complete_void,
freeFunc: ffi_matrix_sdk_ffi_rust_future_free_void,
liftFunc: { $0 },
errorHandler: FfiConverterTypeClientError.lift
errorHandler: FfiConverterTypeRecoveryError.lift
)
}

Expand All @@ -1528,7 +1528,7 @@ public class Encryption:
completeFunc: ffi_matrix_sdk_ffi_rust_future_complete_rust_buffer,
freeFunc: ffi_matrix_sdk_ffi_rust_future_free_rust_buffer,
liftFunc: FfiConverterString.lift,
errorHandler: FfiConverterTypeClientError.lift
errorHandler: FfiConverterTypeRecoveryError.lift
)
}

Expand Down Expand Up @@ -1568,7 +1568,7 @@ public class Encryption:
completeFunc: ffi_matrix_sdk_ffi_rust_future_complete_rust_buffer,
freeFunc: ffi_matrix_sdk_ffi_rust_future_free_rust_buffer,
liftFunc: FfiConverterString.lift,
errorHandler: FfiConverterTypeClientError.lift
errorHandler: FfiConverterTypeRecoveryError.lift
)
}

Expand Down Expand Up @@ -12764,6 +12764,71 @@ extension PusherKind: Equatable, Hashable {}



public enum RecoveryError {



case BackupExistsOnServer
case Client(source: ClientError)
case SecretStorage(message: String)

fileprivate static func uniffiErrorHandler(_ error: RustBuffer) throws -> Error {
return try FfiConverterTypeRecoveryError.lift(error)
}
}


public struct FfiConverterTypeRecoveryError: FfiConverterRustBuffer {
typealias SwiftType = RecoveryError

public static func read(from buf: inout (data: Data, offset: Data.Index)) throws -> RecoveryError {
let variant: Int32 = try readInt(&buf)
switch variant {




case 1: return .BackupExistsOnServer
case 2: return .Client(
source: try FfiConverterTypeClientError.read(from: &buf)
)
case 3: return .SecretStorage(
message: try FfiConverterString.read(from: &buf)
)

default: throw UniffiInternalError.unexpectedEnumCase
}
}

public static func write(_ value: RecoveryError, into buf: inout [UInt8]) {
switch value {





case .BackupExistsOnServer:
writeInt(&buf, Int32(1))


case let .Client(source):
writeInt(&buf, Int32(2))
FfiConverterTypeClientError.write(source, into: &buf)


case let .SecretStorage(message):
writeInt(&buf, Int32(3))
FfiConverterString.write(message, into: &buf)

}
}
}


extension RecoveryError: Equatable, Hashable {}

extension RecoveryError: Error { }

// Note that we don't yet support `indirect` for enums.
// See https://github.com/mozilla/uniffi-rs/issues/396 for further discussion.
public enum RecoveryState {
Expand Down Expand Up @@ -14155,9 +14220,15 @@ public enum SteadyStateError {



case BackupDisabled
case Connection
case Lagged
// Simple error enums only carry a message
case BackupDisabled(message: String)

// Simple error enums only carry a message
case Connection(message: String)

// Simple error enums only carry a message
case Lagged(message: String)


fileprivate static func uniffiErrorHandler(_ error: RustBuffer) throws -> Error {
return try FfiConverterTypeSteadyStateError.lift(error)
Expand All @@ -14175,11 +14246,20 @@ public struct FfiConverterTypeSteadyStateError: FfiConverterRustBuffer {



case 1: return .BackupDisabled
case 2: return .Connection
case 3: return .Lagged
case 1: return .BackupDisabled(
message: try FfiConverterString.read(from: &buf)
)

case 2: return .Connection(
message: try FfiConverterString.read(from: &buf)
)

case 3: return .Lagged(
message: try FfiConverterString.read(from: &buf)
)


default: throw UniffiInternalError.unexpectedEnumCase
default: throw UniffiInternalError.unexpectedEnumCase
}
}

Expand All @@ -14189,17 +14269,13 @@ public struct FfiConverterTypeSteadyStateError: FfiConverterRustBuffer {




case .BackupDisabled:
case .BackupDisabled(_ /* message is ignored*/):
writeInt(&buf, Int32(1))


case .Connection:
case .Connection(_ /* message is ignored*/):
writeInt(&buf, Int32(2))


case .Lagged:
case .Lagged(_ /* message is ignored*/):
writeInt(&buf, Int32(3))


}
}
Expand Down Expand Up @@ -18525,22 +18601,22 @@ private var initializationResult: InitializationResult {
if (uniffi_matrix_sdk_ffi_checksum_method_encryption_backup_state_listener() != 29) {
return InitializationResult.apiChecksumMismatch
}
if (uniffi_matrix_sdk_ffi_checksum_method_encryption_disable_recovery() != 56498) {
if (uniffi_matrix_sdk_ffi_checksum_method_encryption_disable_recovery() != 38729) {
return InitializationResult.apiChecksumMismatch
}
if (uniffi_matrix_sdk_ffi_checksum_method_encryption_enable_backups() != 38094) {
if (uniffi_matrix_sdk_ffi_checksum_method_encryption_enable_backups() != 30690) {
return InitializationResult.apiChecksumMismatch
}
if (uniffi_matrix_sdk_ffi_checksum_method_encryption_enable_recovery() != 13489) {
if (uniffi_matrix_sdk_ffi_checksum_method_encryption_enable_recovery() != 60849) {
return InitializationResult.apiChecksumMismatch
}
if (uniffi_matrix_sdk_ffi_checksum_method_encryption_is_last_device() != 30199) {
if (uniffi_matrix_sdk_ffi_checksum_method_encryption_is_last_device() != 34446) {
return InitializationResult.apiChecksumMismatch
}
if (uniffi_matrix_sdk_ffi_checksum_method_encryption_recover() != 29174) {
if (uniffi_matrix_sdk_ffi_checksum_method_encryption_recover() != 34668) {
return InitializationResult.apiChecksumMismatch
}
if (uniffi_matrix_sdk_ffi_checksum_method_encryption_recover_and_reset() != 16535) {
if (uniffi_matrix_sdk_ffi_checksum_method_encryption_recover_and_reset() != 52410) {
return InitializationResult.apiChecksumMismatch
}
if (uniffi_matrix_sdk_ffi_checksum_method_encryption_recovery_state() != 7187) {
Expand All @@ -18549,7 +18625,7 @@ private var initializationResult: InitializationResult {
if (uniffi_matrix_sdk_ffi_checksum_method_encryption_recovery_state_listener() != 11439) {
return InitializationResult.apiChecksumMismatch
}
if (uniffi_matrix_sdk_ffi_checksum_method_encryption_reset_recovery_key() != 55362) {
if (uniffi_matrix_sdk_ffi_checksum_method_encryption_reset_recovery_key() != 40510) {
return InitializationResult.apiChecksumMismatch
}
if (uniffi_matrix_sdk_ffi_checksum_method_encryption_wait_for_backup_upload_steady_state() != 37083) {
Expand Down

0 comments on commit 3e35994

Please sign in to comment.