mirror of
https://github.com/Novaloop-AG/element-x-ios.git
synced 2026-11-06 04:18:31 +00:00
Bump the RustSDK to v26.10.13
This commit is contained in:
@@ -5940,44 +5940,44 @@ open class ClientBuilderSDKMock: MatrixRustSDK.ClientBuilder, @unchecked Sendabl
|
|||||||
|
|
||||||
//MARK: - withSearchIndexStore
|
//MARK: - withSearchIndexStore
|
||||||
|
|
||||||
private let withSearchIndexStorePathPasswordCallsCountLock = NSLock()
|
private let withSearchIndexStorePathKeyCallsCountLock = NSLock()
|
||||||
private var withSearchIndexStorePathPasswordUnderlyingCallsCount = 0
|
private var withSearchIndexStorePathKeyUnderlyingCallsCount = 0
|
||||||
open var withSearchIndexStorePathPasswordCallsCount: Int {
|
open var withSearchIndexStorePathKeyCallsCount: Int {
|
||||||
get { withSearchIndexStorePathPasswordCallsCountLock.withLock { withSearchIndexStorePathPasswordUnderlyingCallsCount } }
|
get { withSearchIndexStorePathKeyCallsCountLock.withLock { withSearchIndexStorePathKeyUnderlyingCallsCount } }
|
||||||
set { withSearchIndexStorePathPasswordCallsCountLock.withLock { withSearchIndexStorePathPasswordUnderlyingCallsCount = newValue } }
|
set { withSearchIndexStorePathKeyCallsCountLock.withLock { withSearchIndexStorePathKeyUnderlyingCallsCount = newValue } }
|
||||||
}
|
}
|
||||||
open var withSearchIndexStorePathPasswordCalled: Bool {
|
open var withSearchIndexStorePathKeyCalled: Bool {
|
||||||
return withSearchIndexStorePathPasswordCallsCount > 0
|
return withSearchIndexStorePathKeyCallsCount > 0
|
||||||
}
|
}
|
||||||
private let withSearchIndexStorePathPasswordReceivedArgumentsLock = NSLock()
|
private let withSearchIndexStorePathKeyReceivedArgumentsLock = NSLock()
|
||||||
private var withSearchIndexStorePathPasswordUnderlyingReceivedArguments: (path: String, password: String?)?
|
private var withSearchIndexStorePathKeyUnderlyingReceivedArguments: (path: String, key: String?)?
|
||||||
open var withSearchIndexStorePathPasswordReceivedArguments: (path: String, password: String?)? {
|
open var withSearchIndexStorePathKeyReceivedArguments: (path: String, key: String?)? {
|
||||||
get { withSearchIndexStorePathPasswordReceivedArgumentsLock.withLock { withSearchIndexStorePathPasswordUnderlyingReceivedArguments } }
|
get { withSearchIndexStorePathKeyReceivedArgumentsLock.withLock { withSearchIndexStorePathKeyUnderlyingReceivedArguments } }
|
||||||
set { withSearchIndexStorePathPasswordReceivedArgumentsLock.withLock { withSearchIndexStorePathPasswordUnderlyingReceivedArguments = newValue } }
|
set { withSearchIndexStorePathKeyReceivedArgumentsLock.withLock { withSearchIndexStorePathKeyUnderlyingReceivedArguments = newValue } }
|
||||||
}
|
}
|
||||||
private let withSearchIndexStorePathPasswordReceivedInvocationsLock = NSLock()
|
private let withSearchIndexStorePathKeyReceivedInvocationsLock = NSLock()
|
||||||
private var withSearchIndexStorePathPasswordUnderlyingReceivedInvocations: [(path: String, password: String?)] = []
|
private var withSearchIndexStorePathKeyUnderlyingReceivedInvocations: [(path: String, key: String?)] = []
|
||||||
open var withSearchIndexStorePathPasswordReceivedInvocations: [(path: String, password: String?)] {
|
open var withSearchIndexStorePathKeyReceivedInvocations: [(path: String, key: String?)] {
|
||||||
get { withSearchIndexStorePathPasswordReceivedInvocationsLock.withLock { withSearchIndexStorePathPasswordUnderlyingReceivedInvocations } }
|
get { withSearchIndexStorePathKeyReceivedInvocationsLock.withLock { withSearchIndexStorePathKeyUnderlyingReceivedInvocations } }
|
||||||
set { withSearchIndexStorePathPasswordReceivedInvocationsLock.withLock { withSearchIndexStorePathPasswordUnderlyingReceivedInvocations = newValue } }
|
set { withSearchIndexStorePathKeyReceivedInvocationsLock.withLock { withSearchIndexStorePathKeyUnderlyingReceivedInvocations = newValue } }
|
||||||
}
|
}
|
||||||
|
|
||||||
private let withSearchIndexStorePathPasswordReturnValueLock = NSLock()
|
private let withSearchIndexStorePathKeyReturnValueLock = NSLock()
|
||||||
open var withSearchIndexStorePathPasswordUnderlyingReturnValue: ClientBuilder!
|
open var withSearchIndexStorePathKeyUnderlyingReturnValue: ClientBuilder!
|
||||||
open var withSearchIndexStorePathPasswordReturnValue: ClientBuilder! {
|
open var withSearchIndexStorePathKeyReturnValue: ClientBuilder! {
|
||||||
get { withSearchIndexStorePathPasswordReturnValueLock.withLock { withSearchIndexStorePathPasswordUnderlyingReturnValue } }
|
get { withSearchIndexStorePathKeyReturnValueLock.withLock { withSearchIndexStorePathKeyUnderlyingReturnValue } }
|
||||||
set { withSearchIndexStorePathPasswordReturnValueLock.withLock { withSearchIndexStorePathPasswordUnderlyingReturnValue = newValue } }
|
set { withSearchIndexStorePathKeyReturnValueLock.withLock { withSearchIndexStorePathKeyUnderlyingReturnValue = newValue } }
|
||||||
}
|
}
|
||||||
open var withSearchIndexStorePathPasswordClosure: ((String, String?) -> ClientBuilder)?
|
open var withSearchIndexStorePathKeyClosure: ((String, String?) -> ClientBuilder)?
|
||||||
|
|
||||||
open override func withSearchIndexStore(path: String, password: String?) -> ClientBuilder {
|
open override func withSearchIndexStore(path: String, key: String?) -> ClientBuilder {
|
||||||
withSearchIndexStorePathPasswordCallsCountLock.withLock { withSearchIndexStorePathPasswordUnderlyingCallsCount += 1 }
|
withSearchIndexStorePathKeyCallsCountLock.withLock { withSearchIndexStorePathKeyUnderlyingCallsCount += 1 }
|
||||||
withSearchIndexStorePathPasswordReceivedArguments = (path: path, password: password)
|
withSearchIndexStorePathKeyReceivedArguments = (path: path, key: key)
|
||||||
withSearchIndexStorePathPasswordReceivedInvocationsLock.withLock { withSearchIndexStorePathPasswordUnderlyingReceivedInvocations.append((path: path, password: password)) }
|
withSearchIndexStorePathKeyReceivedInvocationsLock.withLock { withSearchIndexStorePathKeyUnderlyingReceivedInvocations.append((path: path, key: key)) }
|
||||||
if let withSearchIndexStorePathPasswordClosure = withSearchIndexStorePathPasswordClosure {
|
if let withSearchIndexStorePathKeyClosure = withSearchIndexStorePathKeyClosure {
|
||||||
return withSearchIndexStorePathPasswordClosure(path, password)
|
return withSearchIndexStorePathKeyClosure(path, key)
|
||||||
} else {
|
} else {
|
||||||
return withSearchIndexStorePathPasswordReturnValue
|
return withSearchIndexStorePathKeyReturnValue
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -11087,7 +11087,7 @@
|
|||||||
repositoryURL = "https://github.com/element-hq/matrix-rust-components-swift";
|
repositoryURL = "https://github.com/element-hq/matrix-rust-components-swift";
|
||||||
requirement = {
|
requirement = {
|
||||||
kind = exactVersion;
|
kind = exactVersion;
|
||||||
version = 26.10.12;
|
version = 26.10.13;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
701C7BEF8F70F7A83E852DCC /* XCRemoteSwiftPackageReference "GZIP" */ = {
|
701C7BEF8F70F7A83E852DCC /* XCRemoteSwiftPackageReference "GZIP" */ = {
|
||||||
|
|||||||
@@ -176,8 +176,8 @@
|
|||||||
"kind" : "remoteSourceControl",
|
"kind" : "remoteSourceControl",
|
||||||
"location" : "https://github.com/element-hq/matrix-rust-components-swift",
|
"location" : "https://github.com/element-hq/matrix-rust-components-swift",
|
||||||
"state" : {
|
"state" : {
|
||||||
"revision" : "3e1afbc22e167073a54ca69a2fcf853bbdd06b79",
|
"revision" : "930385a6bc54c8663767f504d7a63202f541a6d3",
|
||||||
"version" : "26.10.12"
|
"version" : "26.10.13"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -179,7 +179,7 @@ extension ClientProxyMock {
|
|||||||
|
|
||||||
underlyingMaxMediaUploadSize = .success(configuration.maxMediaUploadSize)
|
underlyingMaxMediaUploadSize = .success(configuration.maxMediaUploadSize)
|
||||||
|
|
||||||
storeSizesReturnValue = .success(.init(cryptoStore: 1, stateStore: 9, eventCacheStore: 8, mediaStore: 6))
|
storeSizesReturnValue = .success(.init(cryptoStore: 1, stateStore: 9, eventCacheStore: 8, mediaStore: 6, searchIndex: 5))
|
||||||
|
|
||||||
configurePresenceSendImmediatelyReturnValue = .success(())
|
configurePresenceSendImmediatelyReturnValue = .success(())
|
||||||
}
|
}
|
||||||
|
|||||||
+3
@@ -51,6 +51,9 @@ class DeveloperOptionsScreenViewModel: DeveloperOptionsScreenViewModelType, Deve
|
|||||||
if let mediaStore = sizes.mediaStore {
|
if let mediaStore = sizes.mediaStore {
|
||||||
components.append(.init(name: "MediaStore", size: formatter.format(Int64(mediaStore))))
|
components.append(.init(name: "MediaStore", size: formatter.format(Int64(mediaStore))))
|
||||||
}
|
}
|
||||||
|
if let searchIndex = sizes.searchIndex {
|
||||||
|
components.append(.init(name: "SearchIndex", size: formatter.format(Int64(searchIndex))))
|
||||||
|
}
|
||||||
if let logsSize = try? FileManager.default.sizeForDirectory(at: .appGroupLogsDirectory) {
|
if let logsSize = try? FileManager.default.sizeForDirectory(at: .appGroupLogsDirectory) {
|
||||||
components.append(.init(name: "Log Files", size: formatter.format(Int64(logsSize))))
|
components.append(.init(name: "Log Files", size: formatter.format(Int64(logsSize))))
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -30,7 +30,7 @@ nonisolated struct ClientFactory: ClientFactoryProtocol {
|
|||||||
.sqliteStore(config: .init(dataPath: sessionDirectories.dataPath, cachePath: sessionDirectories.cachePath)
|
.sqliteStore(config: .init(dataPath: sessionDirectories.dataPath, cachePath: sessionDirectories.cachePath)
|
||||||
.highEntropyPassphrase(passphrase: passphrase, base64Variant: .padded))
|
.highEntropyPassphrase(passphrase: passphrase, base64Variant: .padded))
|
||||||
.withSearchIndexStore(path: sessionDirectories.dataPath,
|
.withSearchIndexStore(path: sessionDirectories.dataPath,
|
||||||
password: passphrase.base64EncodedString())
|
key: passphrase.base64EncodedString())
|
||||||
.serverNameOrHomeserverUrl(serverNameOrUrl: serverNameOrBaseURL)
|
.serverNameOrHomeserverUrl(serverNameOrUrl: serverNameOrBaseURL)
|
||||||
|
|
||||||
return try await build(builder, for: .authentication, appHooks: appHooks)
|
return try await build(builder, for: .authentication, appHooks: appHooks)
|
||||||
@@ -71,7 +71,7 @@ nonisolated struct ClientFactory: ClientFactoryProtocol {
|
|||||||
cachePath: credentials.restorationToken.sessionDirectories.cachePath)
|
cachePath: credentials.restorationToken.sessionDirectories.cachePath)
|
||||||
.highEntropyPassphrase(passphrase: credentials.restorationToken.passphrase, base64Variant: .padded))
|
.highEntropyPassphrase(passphrase: credentials.restorationToken.passphrase, base64Variant: .padded))
|
||||||
.withSearchIndexStore(path: credentials.restorationToken.sessionDirectories.dataPath,
|
.withSearchIndexStore(path: credentials.restorationToken.sessionDirectories.dataPath,
|
||||||
password: credentials.restorationToken.passphrase.base64EncodedString())
|
key: credentials.restorationToken.passphrase.base64EncodedString())
|
||||||
.homeserverUrl(url: homeserverURL)
|
.homeserverUrl(url: homeserverURL)
|
||||||
|
|
||||||
return try await build(builder, for: .restoration(credentials.restorationToken.session, .all), appHooks: appHooks)
|
return try await build(builder, for: .restoration(credentials.restorationToken.session, .all), appHooks: appHooks)
|
||||||
|
|||||||
+1
-1
@@ -75,7 +75,7 @@ packages:
|
|||||||
# Element/Matrix dependencies
|
# Element/Matrix dependencies
|
||||||
MatrixRustSDK:
|
MatrixRustSDK:
|
||||||
url: https://github.com/element-hq/matrix-rust-components-swift
|
url: https://github.com/element-hq/matrix-rust-components-swift
|
||||||
exactVersion: 26.10.12
|
exactVersion: 26.10.13
|
||||||
# path: ../matrix-rust-sdk
|
# path: ../matrix-rust-sdk
|
||||||
Compound:
|
Compound:
|
||||||
path: compound-ios
|
path: compound-ios
|
||||||
|
|||||||
Reference in New Issue
Block a user