Skip to content

Commit

Permalink
updated the SDK
Browse files Browse the repository at this point in the history
  • Loading branch information
@Velin92
Velin92 committed Aug 5, 2024
1 parent 72d2b7d commit 3a87919
Show file tree
Hide file tree
Showing 5 changed files with 258 additions and 31 deletions.
2 changes: 1 addition & 1 deletion ElementX.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7505,7 +7505,7 @@
repositoryURL = "https://github.com/element-hq/matrix-rust-components-swift";
requirement = {
kind = exactVersion;
version = 1.0.29;
version = 1.0.31;
};
};
701C7BEF8F70F7A83E852DCC /* XCRemoteSwiftPackageReference "GZIP" */ = {
Expand Down
4 changes: 2 additions & 2 deletions ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Original file line number Diff line number Diff line change
Expand Up @@ -149,8 +149,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/element-hq/matrix-rust-components-swift",
"state" : {
"revision" : "d0226f669526e908d45bf9b5682f372d84cf9ffe",
"version" : "1.0.29"
"revision" : "8e2b4049fb492dcf5b0c796784b7aa7a3c099943",
"version" : "1.0.31"
}
},
{
Expand Down
279 changes: 253 additions & 26 deletions ElementX/Sources/Mocks/Generated/SDKGeneratedMocks.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5915,6 +5915,75 @@ open class EncryptionSDKMock: MatrixRustSDK.Encryption {
}
}

//MARK: - resetIdentity

open var resetIdentityThrowableError: Error?
var resetIdentityUnderlyingCallsCount = 0
open var resetIdentityCallsCount: Int {
get {
if Thread.isMainThread {
return resetIdentityUnderlyingCallsCount
} else {
var returnValue: Int? = nil
DispatchQueue.main.sync {
returnValue = resetIdentityUnderlyingCallsCount
}

return returnValue!
}
}
set {
if Thread.isMainThread {
resetIdentityUnderlyingCallsCount = newValue
} else {
DispatchQueue.main.sync {
resetIdentityUnderlyingCallsCount = newValue
}
}
}
}
open var resetIdentityCalled: Bool {
return resetIdentityCallsCount > 0
}

var resetIdentityUnderlyingReturnValue: IdentityResetHandle?
open var resetIdentityReturnValue: IdentityResetHandle? {
get {
if Thread.isMainThread {
return resetIdentityUnderlyingReturnValue
} else {
var returnValue: IdentityResetHandle?? = nil
DispatchQueue.main.sync {
returnValue = resetIdentityUnderlyingReturnValue
}

return returnValue!
}
}
set {
if Thread.isMainThread {
resetIdentityUnderlyingReturnValue = newValue
} else {
DispatchQueue.main.sync {
resetIdentityUnderlyingReturnValue = newValue
}
}
}
}
open var resetIdentityClosure: (() async throws -> IdentityResetHandle?)?

open override func resetIdentity() async throws -> IdentityResetHandle? {
if let error = resetIdentityThrowableError {
throw error
}
resetIdentityCallsCount += 1
if let resetIdentityClosure = resetIdentityClosure {
return try await resetIdentityClosure()
} else {
return resetIdentityReturnValue
}
}

//MARK: - resetRecoveryKey

open var resetRecoveryKeyThrowableError: Error?
Expand Down Expand Up @@ -7595,6 +7664,128 @@ open class HomeserverLoginDetailsSDKMock: MatrixRustSDK.HomeserverLoginDetails {
}
}
}
open class IdentityResetHandleSDKMock: MatrixRustSDK.IdentityResetHandle {
init() {
super.init(noPointer: .init())
}

public required init(unsafeFromRawPointer pointer: UnsafeMutableRawPointer) {
fatalError("init(unsafeFromRawPointer:) has not been implemented")
}

fileprivate var pointer: UnsafeMutableRawPointer!

//MARK: - authType

var authTypeUnderlyingCallsCount = 0
open var authTypeCallsCount: Int {
get {
if Thread.isMainThread {
return authTypeUnderlyingCallsCount
} else {
var returnValue: Int? = nil
DispatchQueue.main.sync {
returnValue = authTypeUnderlyingCallsCount
}

return returnValue!
}
}
set {
if Thread.isMainThread {
authTypeUnderlyingCallsCount = newValue
} else {
DispatchQueue.main.sync {
authTypeUnderlyingCallsCount = newValue
}
}
}
}
open var authTypeCalled: Bool {
return authTypeCallsCount > 0
}

var authTypeUnderlyingReturnValue: CrossSigningResetAuthType!
open var authTypeReturnValue: CrossSigningResetAuthType! {
get {
if Thread.isMainThread {
return authTypeUnderlyingReturnValue
} else {
var returnValue: CrossSigningResetAuthType? = nil
DispatchQueue.main.sync {
returnValue = authTypeUnderlyingReturnValue
}

return returnValue!
}
}
set {
if Thread.isMainThread {
authTypeUnderlyingReturnValue = newValue
} else {
DispatchQueue.main.sync {
authTypeUnderlyingReturnValue = newValue
}
}
}
}
open var authTypeClosure: (() -> CrossSigningResetAuthType)?

open override func authType() -> CrossSigningResetAuthType {
authTypeCallsCount += 1
if let authTypeClosure = authTypeClosure {
return authTypeClosure()
} else {
return authTypeReturnValue
}
}

//MARK: - reset

open var resetAuthThrowableError: Error?
var resetAuthUnderlyingCallsCount = 0
open var resetAuthCallsCount: Int {
get {
if Thread.isMainThread {
return resetAuthUnderlyingCallsCount
} else {
var returnValue: Int? = nil
DispatchQueue.main.sync {
returnValue = resetAuthUnderlyingCallsCount
}

return returnValue!
}
}
set {
if Thread.isMainThread {
resetAuthUnderlyingCallsCount = newValue
} else {
DispatchQueue.main.sync {
resetAuthUnderlyingCallsCount = newValue
}
}
}
}
open var resetAuthCalled: Bool {
return resetAuthCallsCount > 0
}
open var resetAuthReceivedAuth: AuthData?
open var resetAuthReceivedInvocations: [AuthData?] = []
open var resetAuthClosure: ((AuthData?) async throws -> Void)?

open override func reset(auth: AuthData?) async throws {
if let error = resetAuthThrowableError {
throw error
}
resetAuthCallsCount += 1
resetAuthReceivedAuth = auth
DispatchQueue.main.async {
self.resetAuthReceivedInvocations.append(auth)
}
try await resetAuthClosure?(auth)
}
}
open class MediaFileHandleSDKMock: MatrixRustSDK.MediaFileHandle {
init() {
super.init(noPointer: .init())
Expand Down Expand Up @@ -10798,6 +10989,42 @@ open class RoomSDKMock: MatrixRustSDK.Room {
try await clearComposerDraftClosure?()
}

//MARK: - clearPinnedEventsCache

var clearPinnedEventsCacheUnderlyingCallsCount = 0
open var clearPinnedEventsCacheCallsCount: Int {
get {
if Thread.isMainThread {
return clearPinnedEventsCacheUnderlyingCallsCount
} else {
var returnValue: Int? = nil
DispatchQueue.main.sync {
returnValue = clearPinnedEventsCacheUnderlyingCallsCount
}

return returnValue!
}
}
set {
if Thread.isMainThread {
clearPinnedEventsCacheUnderlyingCallsCount = newValue
} else {
DispatchQueue.main.sync {
clearPinnedEventsCacheUnderlyingCallsCount = newValue
}
}
}
}
open var clearPinnedEventsCacheCalled: Bool {
return clearPinnedEventsCacheCallsCount > 0
}
open var clearPinnedEventsCacheClosure: (() async -> Void)?

open override func clearPinnedEventsCache() async {
clearPinnedEventsCacheCallsCount += 1
await clearPinnedEventsCacheClosure?()
}

//MARK: - discardRoomKey

open var discardRoomKeyThrowableError: Error?
Expand Down Expand Up @@ -12816,76 +13043,76 @@ open class RoomSDKMock: MatrixRustSDK.Room {

//MARK: - pinnedEventsTimeline

open var pinnedEventsTimelineInternalIdPrefixThrowableError: Error?
var pinnedEventsTimelineInternalIdPrefixUnderlyingCallsCount = 0
open var pinnedEventsTimelineInternalIdPrefixCallsCount: Int {
open var pinnedEventsTimelineInternalIdPrefixMaxEventsToLoadThrowableError: Error?
var pinnedEventsTimelineInternalIdPrefixMaxEventsToLoadUnderlyingCallsCount = 0
open var pinnedEventsTimelineInternalIdPrefixMaxEventsToLoadCallsCount: Int {
get {
if Thread.isMainThread {
return pinnedEventsTimelineInternalIdPrefixUnderlyingCallsCount
return pinnedEventsTimelineInternalIdPrefixMaxEventsToLoadUnderlyingCallsCount
} else {
var returnValue: Int? = nil
DispatchQueue.main.sync {
returnValue = pinnedEventsTimelineInternalIdPrefixUnderlyingCallsCount
returnValue = pinnedEventsTimelineInternalIdPrefixMaxEventsToLoadUnderlyingCallsCount
}

return returnValue!
}
}
set {
if Thread.isMainThread {
pinnedEventsTimelineInternalIdPrefixUnderlyingCallsCount = newValue
pinnedEventsTimelineInternalIdPrefixMaxEventsToLoadUnderlyingCallsCount = newValue
} else {
DispatchQueue.main.sync {
pinnedEventsTimelineInternalIdPrefixUnderlyingCallsCount = newValue
pinnedEventsTimelineInternalIdPrefixMaxEventsToLoadUnderlyingCallsCount = newValue
}
}
}
}
open var pinnedEventsTimelineInternalIdPrefixCalled: Bool {
return pinnedEventsTimelineInternalIdPrefixCallsCount > 0
open var pinnedEventsTimelineInternalIdPrefixMaxEventsToLoadCalled: Bool {
return pinnedEventsTimelineInternalIdPrefixMaxEventsToLoadCallsCount > 0
}
open var pinnedEventsTimelineInternalIdPrefixReceivedInternalIdPrefix: String?
open var pinnedEventsTimelineInternalIdPrefixReceivedInvocations: [String?] = []
open var pinnedEventsTimelineInternalIdPrefixMaxEventsToLoadReceivedArguments: (internalIdPrefix: String?, maxEventsToLoad: UInt16)?
open var pinnedEventsTimelineInternalIdPrefixMaxEventsToLoadReceivedInvocations: [(internalIdPrefix: String?, maxEventsToLoad: UInt16)] = []

var pinnedEventsTimelineInternalIdPrefixUnderlyingReturnValue: Timeline!
open var pinnedEventsTimelineInternalIdPrefixReturnValue: Timeline! {
var pinnedEventsTimelineInternalIdPrefixMaxEventsToLoadUnderlyingReturnValue: Timeline!
open var pinnedEventsTimelineInternalIdPrefixMaxEventsToLoadReturnValue: Timeline! {
get {
if Thread.isMainThread {
return pinnedEventsTimelineInternalIdPrefixUnderlyingReturnValue
return pinnedEventsTimelineInternalIdPrefixMaxEventsToLoadUnderlyingReturnValue
} else {
var returnValue: Timeline? = nil
DispatchQueue.main.sync {
returnValue = pinnedEventsTimelineInternalIdPrefixUnderlyingReturnValue
returnValue = pinnedEventsTimelineInternalIdPrefixMaxEventsToLoadUnderlyingReturnValue
}

return returnValue!
}
}
set {
if Thread.isMainThread {
pinnedEventsTimelineInternalIdPrefixUnderlyingReturnValue = newValue
pinnedEventsTimelineInternalIdPrefixMaxEventsToLoadUnderlyingReturnValue = newValue
} else {
DispatchQueue.main.sync {
pinnedEventsTimelineInternalIdPrefixUnderlyingReturnValue = newValue
pinnedEventsTimelineInternalIdPrefixMaxEventsToLoadUnderlyingReturnValue = newValue
}
}
}
}
open var pinnedEventsTimelineInternalIdPrefixClosure: ((String?) async throws -> Timeline)?
open var pinnedEventsTimelineInternalIdPrefixMaxEventsToLoadClosure: ((String?, UInt16) async throws -> Timeline)?

open override func pinnedEventsTimeline(internalIdPrefix: String?) async throws -> Timeline {
if let error = pinnedEventsTimelineInternalIdPrefixThrowableError {
open override func pinnedEventsTimeline(internalIdPrefix: String?, maxEventsToLoad: UInt16) async throws -> Timeline {
if let error = pinnedEventsTimelineInternalIdPrefixMaxEventsToLoadThrowableError {
throw error
}
pinnedEventsTimelineInternalIdPrefixCallsCount += 1
pinnedEventsTimelineInternalIdPrefixReceivedInternalIdPrefix = internalIdPrefix
pinnedEventsTimelineInternalIdPrefixMaxEventsToLoadCallsCount += 1
pinnedEventsTimelineInternalIdPrefixMaxEventsToLoadReceivedArguments = (internalIdPrefix: internalIdPrefix, maxEventsToLoad: maxEventsToLoad)
DispatchQueue.main.async {
self.pinnedEventsTimelineInternalIdPrefixReceivedInvocations.append(internalIdPrefix)
self.pinnedEventsTimelineInternalIdPrefixMaxEventsToLoadReceivedInvocations.append((internalIdPrefix: internalIdPrefix, maxEventsToLoad: maxEventsToLoad))
}
if let pinnedEventsTimelineInternalIdPrefixClosure = pinnedEventsTimelineInternalIdPrefixClosure {
return try await pinnedEventsTimelineInternalIdPrefixClosure(internalIdPrefix)
if let pinnedEventsTimelineInternalIdPrefixMaxEventsToLoadClosure = pinnedEventsTimelineInternalIdPrefixMaxEventsToLoadClosure {
return try await pinnedEventsTimelineInternalIdPrefixMaxEventsToLoadClosure(internalIdPrefix, maxEventsToLoad)
} else {
return pinnedEventsTimelineInternalIdPrefixReturnValue
return pinnedEventsTimelineInternalIdPrefixMaxEventsToLoadReturnValue
}
}

Expand Down
2 changes: 1 addition & 1 deletion ElementX/Sources/Services/Room/RoomProxy.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ class RoomProxy: RoomProxyProtocol {
return innerPinnedEventsTimeline
} else {
do {
let timeline = try await TimelineProxy(timeline: room.pinnedEventsTimeline(internalIdPrefix: nil), isLive: false)
let timeline = try await TimelineProxy(timeline: room.pinnedEventsTimeline(internalIdPrefix: nil, maxEventsToLoad: 100), isLive: false)
await timeline.subscribeForUpdates()
innerPinnedEventsTimeline = timeline
return timeline
Expand Down
2 changes: 1 addition & 1 deletion project.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ packages:
# Element/Matrix dependencies
MatrixRustSDK:
url: https://github.com/element-hq/matrix-rust-components-swift
exactVersion: 1.0.29
exactVersion: 1.0.31
# path: ../matrix-rust-sdk
Compound:
url: https://github.com/element-hq/compound-ios
Expand Down

0 comments on commit 3a87919

Please sign in to comment.