ehealthsolutions/element-x-ios
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/element-x-ios.git synced 2026-11-03 16:10:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update the SDK. (#2776)

Browse Source 
Handle async FFI changes.

Fix flakey unit test.
This commit is contained in:
Doug
2024-05-03 12:00:05 +01:00
committed by GitHub
parent 38416dbb5c
commit 11557e4879
15 changed files with 288 additions and 365 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ElementX.xcodeproj/project.pbxproj
+1 -1
View File
@@ -7336,7 +7336,7 @@
repositoryURL = "https://github.com/matrix-org/matrix-rust-components-swift"; repositoryURL = "https://github.com/matrix-org/matrix-rust-components-swift";
requirement = { requirement = {
kind = exactVersion; kind = exactVersion;
version = 1.1.63; version = 1.1.64;
}; };
}; };
821C67C9A7F8CC3FD41B28B4 /* XCRemoteSwiftPackageReference "emojibase-bindings" */ = { 821C67C9A7F8CC3FD41B28B4 /* XCRemoteSwiftPackageReference "emojibase-bindings" */ = {
ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
+2 -2
View File
@@ -139,8 +139,8 @@
"kind" : "remoteSourceControl", "kind" : "remoteSourceControl",
"location" : "https://github.com/matrix-org/matrix-rust-components-swift", "location" : "https://github.com/matrix-org/matrix-rust-components-swift",
"state" : { "state" : {
"revision" : "3d116223646fc7310b977e5116f96b834a9f57f6", "revision" : "f1ea6a13202bb309d737f9f4f49a0ee94242126b",
"version" : "1.1.63" "version" : "1.1.64"
} }
}, },
{ {
ElementX/Sources/FlowCoordinators/RoomFlowCoordinator.swift
+1 -1
View File
@@ -1136,7 +1136,7 @@ class RoomFlowCoordinator: FlowCoordinatorProtocol {
} }
private func forward(eventID: String, toRoomID roomID: String) async { private func forward(eventID: String, toRoomID roomID: String) async {
guard let messageEventContent = roomProxy.timeline.messageEventContent(for: eventID) else { guard let messageEventContent = await roomProxy.timeline.messageEventContent(for: eventID) else {
MXLog.error("Failed retrieving forwarded message event content for eventID: \(eventID)") MXLog.error("Failed retrieving forwarded message event content for eventID: \(eventID)")
userIndicatorController.submitIndicator(UserIndicator(title: L10n.errorUnknown)) userIndicatorController.submitIndicator(UserIndicator(title: L10n.errorUnknown))
return return
ElementX/Sources/Mocks/Generated/GeneratedMocks.swift
+3 -3
View File
@@ -10960,14 +10960,14 @@ class TimelineProxyMock: TimelineProxyProtocol {
} }
} }
} }
var messageEventContentForClosure: ((String) -> RoomMessageEventContentWithoutRelation?)? var messageEventContentForClosure: ((String) async -> RoomMessageEventContentWithoutRelation?)?
func messageEventContent(for eventID: String) -> RoomMessageEventContentWithoutRelation? { func messageEventContent(for eventID: String) async -> RoomMessageEventContentWithoutRelation? {
messageEventContentForCallsCount += 1 messageEventContentForCallsCount += 1
messageEventContentForReceivedEventID = eventID messageEventContentForReceivedEventID = eventID
messageEventContentForReceivedInvocations.append(eventID) messageEventContentForReceivedInvocations.append(eventID)
if let messageEventContentForClosure = messageEventContentForClosure { if let messageEventContentForClosure = messageEventContentForClosure {
return messageEventContentForClosure(eventID) return await messageEventContentForClosure(eventID)
} else { } else {
return messageEventContentForReturnValue return messageEventContentForReturnValue
} }
ElementX/Sources/Mocks/Generated/SDKGeneratedMocks.swift
+49 -49
View File
@@ -1,4 +1,4 @@
// Generated using Sourcery 2.2.2 — https://github.com/krzysztofzablocki/Sourcery // Generated using Sourcery 2.2.4 — https://github.com/krzysztofzablocki/Sourcery
// DO NOT EDIT // DO NOT EDIT
// swiftlint:disable all // swiftlint:disable all
@@ -63,9 +63,9 @@ class SDKClientMock: SDKClientProtocol {
} }
} }
} }
public var accountDataEventTypeClosure: ((String) throws -> String?)? public var accountDataEventTypeClosure: ((String) async throws -> String?)?
public func accountData(eventType: String) throws -> String? { public func accountData(eventType: String) async throws -> String? {
if let error = accountDataEventTypeThrowableError { if let error = accountDataEventTypeThrowableError {
throw error throw error
} }
@@ -73,7 +73,7 @@ class SDKClientMock: SDKClientProtocol {
accountDataEventTypeReceivedEventType = eventType accountDataEventTypeReceivedEventType = eventType
accountDataEventTypeReceivedInvocations.append(eventType) accountDataEventTypeReceivedInvocations.append(eventType)
if let accountDataEventTypeClosure = accountDataEventTypeClosure { if let accountDataEventTypeClosure = accountDataEventTypeClosure {
return try accountDataEventTypeClosure(eventType) return try await accountDataEventTypeClosure(eventType)
} else { } else {
return accountDataEventTypeReturnValue return accountDataEventTypeReturnValue
} }
@@ -205,15 +205,15 @@ class SDKClientMock: SDKClientProtocol {
} }
} }
} }
public var avatarUrlClosure: (() throws -> String?)? public var avatarUrlClosure: (() async throws -> String?)?
public func avatarUrl() throws -> String? { public func avatarUrl() async throws -> String? {
if let error = avatarUrlThrowableError { if let error = avatarUrlThrowableError {
throw error throw error
} }
avatarUrlCallsCount += 1 avatarUrlCallsCount += 1
if let avatarUrlClosure = avatarUrlClosure { if let avatarUrlClosure = avatarUrlClosure {
return try avatarUrlClosure() return try await avatarUrlClosure()
} else { } else {
return avatarUrlReturnValue return avatarUrlReturnValue
} }
@@ -343,9 +343,9 @@ class SDKClientMock: SDKClientProtocol {
} }
} }
} }
public var createRoomRequestClosure: ((CreateRoomParameters) throws -> String)? public var createRoomRequestClosure: ((CreateRoomParameters) async throws -> String)?
public func createRoom(request: CreateRoomParameters) throws -> String { public func createRoom(request: CreateRoomParameters) async throws -> String {
if let error = createRoomRequestThrowableError { if let error = createRoomRequestThrowableError {
throw error throw error
} }
@@ -353,7 +353,7 @@ class SDKClientMock: SDKClientProtocol {
createRoomRequestReceivedRequest = request createRoomRequestReceivedRequest = request
createRoomRequestReceivedInvocations.append(request) createRoomRequestReceivedInvocations.append(request)
if let createRoomRequestClosure = createRoomRequestClosure { if let createRoomRequestClosure = createRoomRequestClosure {
return try createRoomRequestClosure(request) return try await createRoomRequestClosure(request)
} else { } else {
return createRoomRequestReturnValue return createRoomRequestReturnValue
} }
@@ -524,15 +524,15 @@ class SDKClientMock: SDKClientProtocol {
} }
} }
} }
public var displayNameClosure: (() throws -> String)? public var displayNameClosure: (() async throws -> String)?
public func displayName() throws -> String { public func displayName() async throws -> String {
if let error = displayNameThrowableError { if let error = displayNameThrowableError {
throw error throw error
} }
displayNameCallsCount += 1 displayNameCallsCount += 1
if let displayNameClosure = displayNameClosure { if let displayNameClosure = displayNameClosure {
return try displayNameClosure() return try await displayNameClosure()
} else { } else {
return displayNameReturnValue return displayNameReturnValue
} }
@@ -1010,9 +1010,9 @@ class SDKClientMock: SDKClientProtocol {
} }
} }
} }
public var getProfileUserIdClosure: ((String) throws -> UserProfile)? public var getProfileUserIdClosure: ((String) async throws -> UserProfile)?
public func getProfile(userId: String) throws -> UserProfile { public func getProfile(userId: String) async throws -> UserProfile {
if let error = getProfileUserIdThrowableError { if let error = getProfileUserIdThrowableError {
throw error throw error
} }
@@ -1020,7 +1020,7 @@ class SDKClientMock: SDKClientProtocol {
getProfileUserIdReceivedUserId = userId getProfileUserIdReceivedUserId = userId
getProfileUserIdReceivedInvocations.append(userId) getProfileUserIdReceivedInvocations.append(userId)
if let getProfileUserIdClosure = getProfileUserIdClosure { if let getProfileUserIdClosure = getProfileUserIdClosure {
return try getProfileUserIdClosure(userId) return try await getProfileUserIdClosure(userId)
} else { } else {
return getProfileUserIdReturnValue return getProfileUserIdReturnValue
} }
@@ -1220,15 +1220,15 @@ class SDKClientMock: SDKClientProtocol {
} }
} }
} }
public var getSessionVerificationControllerClosure: (() throws -> SessionVerificationController)? public var getSessionVerificationControllerClosure: (() async throws -> SessionVerificationController)?
public func getSessionVerificationController() throws -> SessionVerificationController { public func getSessionVerificationController() async throws -> SessionVerificationController {
if let error = getSessionVerificationControllerThrowableError { if let error = getSessionVerificationControllerThrowableError {
throw error throw error
} }
getSessionVerificationControllerCallsCount += 1 getSessionVerificationControllerCallsCount += 1
if let getSessionVerificationControllerClosure = getSessionVerificationControllerClosure { if let getSessionVerificationControllerClosure = getSessionVerificationControllerClosure {
return try getSessionVerificationControllerClosure() return try await getSessionVerificationControllerClosure()
} else { } else {
return getSessionVerificationControllerReturnValue return getSessionVerificationControllerReturnValue
} }
@@ -1578,15 +1578,15 @@ class SDKClientMock: SDKClientProtocol {
} }
} }
} }
public var logoutClosure: (() throws -> String?)? public var logoutClosure: (() async throws -> String?)?
public func logout() throws -> String? { public func logout() async throws -> String? {
if let error = logoutThrowableError { if let error = logoutThrowableError {
throw error throw error
} }
logoutCallsCount += 1 logoutCallsCount += 1
if let logoutClosure = logoutClosure { if let logoutClosure = logoutClosure {
return try logoutClosure() return try await logoutClosure()
} else { } else {
return logoutReturnValue return logoutReturnValue
} }
@@ -1624,13 +1624,13 @@ class SDKClientMock: SDKClientProtocol {
public var notificationClientProcessSetupReceivedProcessSetup: NotificationProcessSetup? public var notificationClientProcessSetupReceivedProcessSetup: NotificationProcessSetup?
public var notificationClientProcessSetupReceivedInvocations: [NotificationProcessSetup] = [] public var notificationClientProcessSetupReceivedInvocations: [NotificationProcessSetup] = []
var notificationClientProcessSetupUnderlyingReturnValue: NotificationClientBuilder! var notificationClientProcessSetupUnderlyingReturnValue: NotificationClient!
public var notificationClientProcessSetupReturnValue: NotificationClientBuilder! { public var notificationClientProcessSetupReturnValue: NotificationClient! {
get { get {
if Thread.isMainThread { if Thread.isMainThread {
return notificationClientProcessSetupUnderlyingReturnValue return notificationClientProcessSetupUnderlyingReturnValue
} else { } else {
var returnValue: NotificationClientBuilder? = nil var returnValue: NotificationClient? = nil
DispatchQueue.main.sync { DispatchQueue.main.sync {
returnValue = notificationClientProcessSetupUnderlyingReturnValue returnValue = notificationClientProcessSetupUnderlyingReturnValue
} }
@@ -1648,9 +1648,9 @@ class SDKClientMock: SDKClientProtocol {
} }
} }
} }
public var notificationClientProcessSetupClosure: ((NotificationProcessSetup) throws -> NotificationClientBuilder)? public var notificationClientProcessSetupClosure: ((NotificationProcessSetup) async throws -> NotificationClient)?
public func notificationClient(processSetup: NotificationProcessSetup) throws -> NotificationClientBuilder { public func notificationClient(processSetup: NotificationProcessSetup) async throws -> NotificationClient {
if let error = notificationClientProcessSetupThrowableError { if let error = notificationClientProcessSetupThrowableError {
throw error throw error
} }
@@ -1658,7 +1658,7 @@ class SDKClientMock: SDKClientProtocol {
notificationClientProcessSetupReceivedProcessSetup = processSetup notificationClientProcessSetupReceivedProcessSetup = processSetup
notificationClientProcessSetupReceivedInvocations.append(processSetup) notificationClientProcessSetupReceivedInvocations.append(processSetup)
if let notificationClientProcessSetupClosure = notificationClientProcessSetupClosure { if let notificationClientProcessSetupClosure = notificationClientProcessSetupClosure {
return try notificationClientProcessSetupClosure(processSetup) return try await notificationClientProcessSetupClosure(processSetup)
} else { } else {
return notificationClientProcessSetupReturnValue return notificationClientProcessSetupReturnValue
} }
@@ -1693,14 +1693,14 @@ class SDKClientMock: SDKClientProtocol {
public var removeAvatarCalled: Bool { public var removeAvatarCalled: Bool {
return removeAvatarCallsCount > 0 return removeAvatarCallsCount > 0
} }
public var removeAvatarClosure: (() throws -> Void)? public var removeAvatarClosure: (() async throws -> Void)?
public func removeAvatar() throws { public func removeAvatar() async throws {
if let error = removeAvatarThrowableError { if let error = removeAvatarThrowableError {
throw error throw error
} }
removeAvatarCallsCount += 1 removeAvatarCallsCount += 1
try removeAvatarClosure?() try await removeAvatarClosure?()
} }
//MARK: - resolveRoomAlias //MARK: - resolveRoomAlias
@@ -1806,16 +1806,16 @@ class SDKClientMock: SDKClientProtocol {
} }
public var restoreSessionSessionReceivedSession: Session? public var restoreSessionSessionReceivedSession: Session?
public var restoreSessionSessionReceivedInvocations: [Session] = [] public var restoreSessionSessionReceivedInvocations: [Session] = []
public var restoreSessionSessionClosure: ((Session) throws -> Void)? public var restoreSessionSessionClosure: ((Session) async throws -> Void)?
public func restoreSession(session: Session) throws { public func restoreSession(session: Session) async throws {
if let error = restoreSessionSessionThrowableError { if let error = restoreSessionSessionThrowableError {
throw error throw error
} }
restoreSessionSessionCallsCount += 1 restoreSessionSessionCallsCount += 1
restoreSessionSessionReceivedSession = session restoreSessionSessionReceivedSession = session
restoreSessionSessionReceivedInvocations.append(session) restoreSessionSessionReceivedInvocations.append(session)
try restoreSessionSessionClosure?(session) try await restoreSessionSessionClosure?(session)
} }
//MARK: - roomDirectorySearch //MARK: - roomDirectorySearch
@@ -2002,9 +2002,9 @@ class SDKClientMock: SDKClientProtocol {
} }
} }
} }
public var searchUsersSearchTermLimitClosure: ((String, UInt64) throws -> SearchUsersResults)? public var searchUsersSearchTermLimitClosure: ((String, UInt64) async throws -> SearchUsersResults)?
public func searchUsers(searchTerm: String, limit: UInt64) throws -> SearchUsersResults { public func searchUsers(searchTerm: String, limit: UInt64) async throws -> SearchUsersResults {
if let error = searchUsersSearchTermLimitThrowableError { if let error = searchUsersSearchTermLimitThrowableError {
throw error throw error
} }
@@ -2012,7 +2012,7 @@ class SDKClientMock: SDKClientProtocol {
searchUsersSearchTermLimitReceivedArguments = (searchTerm: searchTerm, limit: limit) searchUsersSearchTermLimitReceivedArguments = (searchTerm: searchTerm, limit: limit)
searchUsersSearchTermLimitReceivedInvocations.append((searchTerm: searchTerm, limit: limit)) searchUsersSearchTermLimitReceivedInvocations.append((searchTerm: searchTerm, limit: limit))
if let searchUsersSearchTermLimitClosure = searchUsersSearchTermLimitClosure { if let searchUsersSearchTermLimitClosure = searchUsersSearchTermLimitClosure {
return try searchUsersSearchTermLimitClosure(searchTerm, limit) return try await searchUsersSearchTermLimitClosure(searchTerm, limit)
} else { } else {
return searchUsersSearchTermLimitReturnValue return searchUsersSearchTermLimitReturnValue
} }
@@ -2072,15 +2072,15 @@ class SDKClientMock: SDKClientProtocol {
} }
} }
} }
public var sessionClosure: (() throws -> Session)? public var sessionClosure: (() async throws -> Session)?
public func session() throws -> Session { public func session() async throws -> Session {
if let error = sessionThrowableError { if let error = sessionThrowableError {
throw error throw error
} }
sessionCallsCount += 1 sessionCallsCount += 1
if let sessionClosure = sessionClosure { if let sessionClosure = sessionClosure {
return try sessionClosure() return try await sessionClosure()
} else { } else {
return sessionReturnValue return sessionReturnValue
} }
@@ -2117,16 +2117,16 @@ class SDKClientMock: SDKClientProtocol {
} }
public var setAccountDataEventTypeContentReceivedArguments: (eventType: String, content: String)? public var setAccountDataEventTypeContentReceivedArguments: (eventType: String, content: String)?
public var setAccountDataEventTypeContentReceivedInvocations: [(eventType: String, content: String)] = [] public var setAccountDataEventTypeContentReceivedInvocations: [(eventType: String, content: String)] = []
public var setAccountDataEventTypeContentClosure: ((String, String) throws -> Void)? public var setAccountDataEventTypeContentClosure: ((String, String) async throws -> Void)?
public func setAccountData(eventType: String, content: String) throws { public func setAccountData(eventType: String, content: String) async throws {
if let error = setAccountDataEventTypeContentThrowableError { if let error = setAccountDataEventTypeContentThrowableError {
throw error throw error
} }
setAccountDataEventTypeContentCallsCount += 1 setAccountDataEventTypeContentCallsCount += 1
setAccountDataEventTypeContentReceivedArguments = (eventType: eventType, content: content) setAccountDataEventTypeContentReceivedArguments = (eventType: eventType, content: content)
setAccountDataEventTypeContentReceivedInvocations.append((eventType: eventType, content: content)) setAccountDataEventTypeContentReceivedInvocations.append((eventType: eventType, content: content))
try setAccountDataEventTypeContentClosure?(eventType, content) try await setAccountDataEventTypeContentClosure?(eventType, content)
} }
//MARK: - setDelegate //MARK: - setDelegate
@@ -2228,16 +2228,16 @@ class SDKClientMock: SDKClientProtocol {
} }
public var setDisplayNameNameReceivedName: String? public var setDisplayNameNameReceivedName: String?
public var setDisplayNameNameReceivedInvocations: [String] = [] public var setDisplayNameNameReceivedInvocations: [String] = []
public var setDisplayNameNameClosure: ((String) throws -> Void)? public var setDisplayNameNameClosure: ((String) async throws -> Void)?
public func setDisplayName(name: String) throws { public func setDisplayName(name: String) async throws {
if let error = setDisplayNameNameThrowableError { if let error = setDisplayNameNameThrowableError {
throw error throw error
} }
setDisplayNameNameCallsCount += 1 setDisplayNameNameCallsCount += 1
setDisplayNameNameReceivedName = name setDisplayNameNameReceivedName = name
setDisplayNameNameReceivedInvocations.append(name) setDisplayNameNameReceivedInvocations.append(name)
try setDisplayNameNameClosure?(name) try await setDisplayNameNameClosure?(name)
} }
//MARK: - setPusher //MARK: - setPusher
@@ -2532,16 +2532,16 @@ class SDKClientMock: SDKClientProtocol {
} }
public var uploadAvatarMimeTypeDataReceivedArguments: (mimeType: String, data: Data)? public var uploadAvatarMimeTypeDataReceivedArguments: (mimeType: String, data: Data)?
public var uploadAvatarMimeTypeDataReceivedInvocations: [(mimeType: String, data: Data)] = [] public var uploadAvatarMimeTypeDataReceivedInvocations: [(mimeType: String, data: Data)] = []
public var uploadAvatarMimeTypeDataClosure: ((String, Data) throws -> Void)? public var uploadAvatarMimeTypeDataClosure: ((String, Data) async throws -> Void)?
public func uploadAvatar(mimeType: String, data: Data) throws { public func uploadAvatar(mimeType: String, data: Data) async throws {
if let error = uploadAvatarMimeTypeDataThrowableError { if let error = uploadAvatarMimeTypeDataThrowableError {
throw error throw error
} }
uploadAvatarMimeTypeDataCallsCount += 1 uploadAvatarMimeTypeDataCallsCount += 1
uploadAvatarMimeTypeDataReceivedArguments = (mimeType: mimeType, data: data) uploadAvatarMimeTypeDataReceivedArguments = (mimeType: mimeType, data: data)
uploadAvatarMimeTypeDataReceivedInvocations.append((mimeType: mimeType, data: data)) uploadAvatarMimeTypeDataReceivedInvocations.append((mimeType: mimeType, data: data))
try uploadAvatarMimeTypeDataClosure?(mimeType, data) try await uploadAvatarMimeTypeDataClosure?(mimeType, data)
} }
//MARK: - uploadMedia //MARK: - uploadMedia
ElementX/Sources/Services/Authentication/AuthenticationServiceProxy.swift
+2 -6
View File
@@ -114,15 +114,11 @@ class AuthenticationServiceProxy: AuthenticationServiceProxyProtocol {
initialDeviceName: initialDeviceName, initialDeviceName: initialDeviceName,
deviceId: deviceID) deviceId: deviceID)
let refreshToken = try? await Task.dispatch(on: .global()) { let refreshToken = try? await client.session().refreshToken
try client.session().refreshToken
}
if refreshToken != nil { if refreshToken != nil {
MXLog.warning("Refresh token found for a non oidc session, can't restore session, logging out") MXLog.warning("Refresh token found for a non oidc session, can't restore session, logging out")
_ = await Task.dispatch(on: .global()) { _ = try? await client.logout()
try? client.logout()
}
return .failure(.sessionTokenRefreshNotSupported) return .failure(.sessionTokenRefreshNotSupported)
} }
ElementX/Sources/Services/Client/ClientProxy.swift
+96 -122
View File
@@ -315,49 +315,41 @@ class ClientProxy: ClientProxyProtocol {
} }
func createDirectRoom(with userID: String, expectedRoomName: String?) async -> Result<String, ClientProxyError> { func createDirectRoom(with userID: String, expectedRoomName: String?) async -> Result<String, ClientProxyError> {
let result: Result<String, ClientProxyError> = await Task.dispatch(on: clientQueue) { do {
do { let parameters = CreateRoomParameters(name: nil,
let parameters = CreateRoomParameters(name: nil, topic: nil,
topic: nil, isEncrypted: true,
isEncrypted: true, isDirect: true,
isDirect: true, visibility: .private,
visibility: .private, preset: .trustedPrivateChat,
preset: .trustedPrivateChat, invite: [userID],
invite: [userID], avatar: nil,
avatar: nil, powerLevelContentOverride: Self.roomCreationPowerLevelOverrides)
powerLevelContentOverride: Self.roomCreationPowerLevelOverrides) let result = try await client.createRoom(request: parameters)
let result = try self.client.createRoom(request: parameters) return await waitForRoomSummary(with: .success(result), name: expectedRoomName)
return .success(result) } catch {
} catch { MXLog.error("Failed creating direct room for userID: \(userID) with error: \(error)")
MXLog.error("Failed creating direct room for userID: \(userID) with error: \(error)") return .failure(.sdkError(error))
return .failure(.sdkError(error))
}
} }
return await waitForRoomSummary(with: result, name: expectedRoomName)
} }
func createRoom(name: String, topic: String?, isRoomPrivate: Bool, userIDs: [String], avatarURL: URL?) async -> Result<String, ClientProxyError> { func createRoom(name: String, topic: String?, isRoomPrivate: Bool, userIDs: [String], avatarURL: URL?) async -> Result<String, ClientProxyError> {
let result: Result<String, ClientProxyError> = await Task.dispatch(on: clientQueue) { do {
do { let parameters = CreateRoomParameters(name: name,
let parameters = CreateRoomParameters(name: name, topic: topic,
topic: topic, isEncrypted: isRoomPrivate,
isEncrypted: isRoomPrivate, isDirect: false,
isDirect: false, visibility: isRoomPrivate ? .private : .public,
visibility: isRoomPrivate ? .private : .public, preset: isRoomPrivate ? .privateChat : .publicChat,
preset: isRoomPrivate ? .privateChat : .publicChat, invite: userIDs,
invite: userIDs, avatar: avatarURL?.absoluteString,
avatar: avatarURL?.absoluteString, powerLevelContentOverride: Self.roomCreationPowerLevelOverrides)
powerLevelContentOverride: Self.roomCreationPowerLevelOverrides) let roomID = try await client.createRoom(request: parameters)
let roomID = try self.client.createRoom(request: parameters) return await waitForRoomSummary(with: .success(roomID), name: name)
return .success(roomID) } catch {
} catch { MXLog.error("Failed creating room with error: \(error)")
MXLog.error("Failed creating room with error: \(error)") return .failure(.sdkError(error))
return .failure(.sdkError(error))
}
} }
return await waitForRoomSummary(with: result, name: name)
} }
func joinRoom(_ roomID: String) async -> Result<Void, ClientProxyError> { func joinRoom(_ roomID: String) async -> Result<Void, ClientProxyError> {
@@ -462,103 +454,89 @@ class ClientProxy: ClientProxyProtocol {
} }
func loadUserDisplayName() async -> Result<Void, ClientProxyError> { func loadUserDisplayName() async -> Result<Void, ClientProxyError> {
await Task.dispatch(on: clientQueue) { do {
do { let displayName = try await client.displayName()
let displayName = try self.client.displayName() userDisplayNameSubject.send(displayName)
self.userDisplayNameSubject.send(displayName) return .success(())
return .success(()) } catch {
} catch { MXLog.error("Failed loading user display name with error: \(error)")
MXLog.error("Failed loading user display name with error: \(error)") return .failure(.sdkError(error))
return .failure(.sdkError(error))
}
} }
} }
func setUserDisplayName(_ name: String) async -> Result<Void, ClientProxyError> { func setUserDisplayName(_ name: String) async -> Result<Void, ClientProxyError> {
await Task.dispatch(on: clientQueue) { do {
do { try await client.setDisplayName(name: name)
try self.client.setDisplayName(name: name) Task {
Task { await self.loadUserDisplayName()
await self.loadUserDisplayName()
}
return .success(())
} catch {
MXLog.error("Failed setting user display name with error: \(error)")
return .failure(.sdkError(error))
} }
return .success(())
} catch {
MXLog.error("Failed setting user display name with error: \(error)")
return .failure(.sdkError(error))
} }
} }
func loadUserAvatarURL() async -> Result<Void, ClientProxyError> { func loadUserAvatarURL() async -> Result<Void, ClientProxyError> {
await Task.dispatch(on: clientQueue) { do {
do { let urlString = try await client.avatarUrl()
let urlString = try self.client.avatarUrl() loadCachedAvatarURLTask?.cancel()
self.loadCachedAvatarURLTask?.cancel() userAvatarURLSubject.send(urlString.flatMap(URL.init))
self.userAvatarURLSubject.send(urlString.flatMap(URL.init)) return .success(())
return .success(()) } catch {
} catch { MXLog.error("Failed loading user avatar URL with error: \(error)")
MXLog.error("Failed loading user avatar URL with error: \(error)") return .failure(.sdkError(error))
return .failure(.sdkError(error))
}
} }
} }
func setUserAvatar(media: MediaInfo) async -> Result<Void, ClientProxyError> { func setUserAvatar(media: MediaInfo) async -> Result<Void, ClientProxyError> {
await Task.dispatch(on: .global()) { guard case let .image(imageURL, _, _) = media, let mimeType = media.mimeType else {
guard case let .image(imageURL, _, _) = media, let mimeType = media.mimeType else { MXLog.error("Failed uploading, invalid media: \(media)")
MXLog.error("Failed uploading, invalid media: \(media)") return .failure(.invalidMedia)
return .failure(.invalidMedia) }
}
do { do {
let data = try Data(contentsOf: imageURL) let data = try Data(contentsOf: imageURL)
try self.client.uploadAvatar(mimeType: mimeType, data: data) try await client.uploadAvatar(mimeType: mimeType, data: data)
Task { Task {
await self.loadUserAvatarURL() await self.loadUserAvatarURL()
}
return .success(())
} catch {
MXLog.error("Failed setting user avatar with error: \(error)")
return .failure(.sdkError(error))
} }
return .success(())
} catch {
MXLog.error("Failed setting user avatar with error: \(error)")
return .failure(.sdkError(error))
} }
} }
func removeUserAvatar() async -> Result<Void, ClientProxyError> { func removeUserAvatar() async -> Result<Void, ClientProxyError> {
await Task.dispatch(on: .global()) { do {
do { try await client.removeAvatar()
try self.client.removeAvatar() Task {
Task { await self.loadUserAvatarURL()
await self.loadUserAvatarURL()
}
return .success(())
} catch {
MXLog.error("Failed removing user avatar with error: \(error)")
return .failure(.sdkError(error))
} }
return .success(())
} catch {
MXLog.error("Failed removing user avatar with error: \(error)")
return .failure(.sdkError(error))
} }
} }
func sessionVerificationControllerProxy() async -> Result<SessionVerificationControllerProxyProtocol, ClientProxyError> { func sessionVerificationControllerProxy() async -> Result<SessionVerificationControllerProxyProtocol, ClientProxyError> {
await Task.dispatch(on: clientQueue) { do {
do { let sessionVerificationController = try await client.getSessionVerificationController()
let sessionVerificationController = try self.client.getSessionVerificationController() return .success(SessionVerificationControllerProxy(sessionVerificationController: sessionVerificationController))
return .success(SessionVerificationControllerProxy(sessionVerificationController: sessionVerificationController)) } catch {
} catch { MXLog.error("Failed retrieving session verification controller proxy with error: \(error)")
MXLog.error("Failed retrieving session verification controller proxy with error: \(error)") return .failure(.sdkError(error))
return .failure(.sdkError(error))
}
} }
} }
func logout() async -> URL? { func logout() async -> URL? {
await Task.dispatch(on: clientQueue) { do {
do { return try await client.logout().flatMap(URL.init(string:))
return try self.client.logout().flatMap(URL.init(string:)) } catch {
} catch { MXLog.error("Failed logging out with error: \(error)")
MXLog.error("Failed logging out with error: \(error)") return nil
return nil
}
} }
} }
@@ -572,24 +550,20 @@ class ClientProxy: ClientProxyProtocol {
} }
func searchUsers(searchTerm: String, limit: UInt) async -> Result<SearchUsersResultsProxy, ClientProxyError> { func searchUsers(searchTerm: String, limit: UInt) async -> Result<SearchUsersResultsProxy, ClientProxyError> {
await Task.dispatch(on: clientQueue) { do {
do { return try await .success(.init(sdkResults: client.searchUsers(searchTerm: searchTerm, limit: UInt64(limit))))
return try .success(.init(sdkResults: self.client.searchUsers(searchTerm: searchTerm, limit: UInt64(limit)))) } catch {
} catch { MXLog.error("Failed searching users with error: \(error)")
MXLog.error("Failed searching users with error: \(error)") return .failure(.sdkError(error))
return .failure(.sdkError(error))
}
} }
} }
func profile(for userID: String) async -> Result<UserProfileProxy, ClientProxyError> { func profile(for userID: String) async -> Result<UserProfileProxy, ClientProxyError> {
await Task.dispatch(on: clientQueue) { do {
do { return try await .success(.init(sdkUserProfile: client.getProfile(userId: userID)))
return try .success(.init(sdkUserProfile: self.client.getProfile(userId: userID))) } catch {
} catch { MXLog.error("Failed retrieving profile for userID: \(userID) with error: \(error)")
MXLog.error("Failed retrieving profile for userID: \(userID) with error: \(error)") return .failure(.sdkError(error))
return .failure(.sdkError(error))
}
} }
} }
@@ -815,7 +789,7 @@ class ClientProxy: ClientProxyProtocol {
private func roomTupleForIdentifier(_ identifier: String) async -> (RoomListItem?, Room?) { private func roomTupleForIdentifier(_ identifier: String) async -> (RoomListItem?, Room?) {
do { do {
let roomListItem = try roomListService?.room(roomId: identifier) let roomListItem = try await roomListService?.room(roomId: identifier)
if roomListItem?.isTimelineInitialized() == false { if roomListItem?.isTimelineInitialized() == false {
try await roomListItem?.initTimeline(eventTypeFilter: eventFilters, internalIdPrefix: nil) try await roomListItem?.initTimeline(eventTypeFilter: eventFilters, internalIdPrefix: nil)
} }
ElementX/Sources/Services/Room/RoomProxy.swift
+61 -83
View File
@@ -27,8 +27,6 @@ class RoomProxy: RoomProxyProtocol {
private let room: RoomProtocol private let room: RoomProtocol
let timeline: TimelineProxyProtocol let timeline: TimelineProxyProtocol
private let userInitiatedDispatchQueue = DispatchQueue(label: "io.element.elementx.roomproxy.user_initiated", qos: .userInitiated)
// periphery:ignore - required for instance retention in the rust codebase // periphery:ignore - required for instance retention in the rust codebase
private var roomInfoObservationToken: TaskHandle? private var roomInfoObservationToken: TaskHandle?
// periphery:ignore - required for instance retention in the rust codebase // periphery:ignore - required for instance retention in the rust codebase
@@ -58,7 +56,7 @@ class RoomProxy: RoomProxyProtocol {
} }
var name: String? { var name: String? {
roomListItem.name() roomListItem.displayName()
} }
var topic: String? { var topic: String? {
@@ -182,26 +180,22 @@ class RoomProxy: RoomProxyProtocol {
} }
func redact(_ eventID: String) async -> Result<Void, RoomProxyError> { func redact(_ eventID: String) async -> Result<Void, RoomProxyError> {
await Task.dispatch(on: userInitiatedDispatchQueue) { do {
do { try await room.redact(eventId: eventID, reason: nil)
try self.room.redact(eventId: eventID, reason: nil) return .success(())
return .success(()) } catch {
} catch { MXLog.error("Failed redacting eventID: \(eventID) with error: \(error)")
MXLog.error("Failed redacting eventID: \(eventID) with error: \(error)") return .failure(.sdkError(error))
return .failure(.sdkError(error))
}
} }
} }
func reportContent(_ eventID: String, reason: String?) async -> Result<Void, RoomProxyError> { func reportContent(_ eventID: String, reason: String?) async -> Result<Void, RoomProxyError> {
await Task.dispatch(on: userInitiatedDispatchQueue) { do {
do { try await room.reportContent(eventId: eventID, score: nil, reason: reason)
try self.room.reportContent(eventId: eventID, score: nil, reason: reason) return .success(())
return .success(()) } catch {
} catch { MXLog.error("Failed reporting eventID: \(eventID) with error: \(error)")
MXLog.error("Failed reporting eventID: \(eventID) with error: \(error)") return .failure(.sdkError(error))
return .failure(.sdkError(error))
}
} }
} }
@@ -243,99 +237,83 @@ class RoomProxy: RoomProxyProtocol {
} }
func leaveRoom() async -> Result<Void, RoomProxyError> { func leaveRoom() async -> Result<Void, RoomProxyError> {
await Task.dispatch(on: .global()) { do {
do { try await room.leave()
try self.room.leave() return .success(())
return .success(()) } catch {
} catch { MXLog.error("Failed leaving room with error: \(error)")
MXLog.error("Failed leaving room with error: \(error)") return .failure(.sdkError(error))
return .failure(.sdkError(error))
}
} }
} }
func rejectInvitation() async -> Result<Void, RoomProxyError> { func rejectInvitation() async -> Result<Void, RoomProxyError> {
await Task.dispatch(on: .global()) { do {
do { return try await .success(room.leave())
return try .success(self.room.leave()) } catch {
} catch { MXLog.error("Failed rejecting invitiation with error: \(error)")
MXLog.error("Failed rejecting invitiation with error: \(error)") return .failure(.sdkError(error))
return .failure(.sdkError(error))
}
} }
} }
func acceptInvitation() async -> Result<Void, RoomProxyError> { func acceptInvitation() async -> Result<Void, RoomProxyError> {
await Task.dispatch(on: .global()) { do {
do { try await room.join()
try self.room.join() return .success(())
return .success(()) } catch {
} catch { MXLog.error("Failed accepting invitation with error: \(error)")
MXLog.error("Failed accepting invitation with error: \(error)") return .failure(.sdkError(error))
return .failure(.sdkError(error))
}
} }
} }
func invite(userID: String) async -> Result<Void, RoomProxyError> { func invite(userID: String) async -> Result<Void, RoomProxyError> {
await Task.dispatch(on: .global()) { do {
do { MXLog.info("Inviting user \(userID)")
MXLog.info("Inviting user \(userID)") return try await .success(room.inviteUserById(userId: userID))
return try .success(self.room.inviteUserById(userId: userID)) } catch {
} catch { MXLog.error("Failed inviting user \(userID) with error: \(error)")
MXLog.error("Failed inviting user \(userID) with error: \(error)") return .failure(.sdkError(error))
return .failure(.sdkError(error))
}
} }
} }
func setName(_ name: String) async -> Result<Void, RoomProxyError> { func setName(_ name: String) async -> Result<Void, RoomProxyError> {
await Task.dispatch(on: .global()) { do {
do { return try await .success(room.setName(name: name))
return try .success(self.room.setName(name: name)) } catch {
} catch { MXLog.error("Failed setting name with error: \(error)")
MXLog.error("Failed setting name with error: \(error)") return .failure(.sdkError(error))
return .failure(.sdkError(error))
}
} }
} }
func setTopic(_ topic: String) async -> Result<Void, RoomProxyError> { func setTopic(_ topic: String) async -> Result<Void, RoomProxyError> {
await Task.dispatch(on: .global()) { do {
do { return try await .success(room.setTopic(topic: topic))
return try .success(self.room.setTopic(topic: topic)) } catch {
} catch { MXLog.error("Failed setting topic with error: \(error)")
MXLog.error("Failed setting topic with error: \(error)") return .failure(.sdkError(error))
return .failure(.sdkError(error))
}
} }
} }
func removeAvatar() async -> Result<Void, RoomProxyError> { func removeAvatar() async -> Result<Void, RoomProxyError> {
await Task.dispatch(on: .global()) { do {
do { return try await .success(room.removeAvatar())
return try .success(self.room.removeAvatar()) } catch {
} catch { MXLog.error("Failed removing avatar with error: \(error)")
MXLog.error("Failed removing avatar with error: \(error)") return .failure(.sdkError(error))
return .failure(.sdkError(error))
}
} }
} }
func uploadAvatar(media: MediaInfo) async -> Result<Void, RoomProxyError> { func uploadAvatar(media: MediaInfo) async -> Result<Void, RoomProxyError> {
await Task.dispatch(on: .global()) { guard case let .image(imageURL, _, _) = media, let mimeType = media.mimeType else {
guard case let .image(imageURL, _, _) = media, let mimeType = media.mimeType else { MXLog.error("Failed uploading avatar, invalid media: \(media)")
MXLog.error("Failed uploading avatar, invalid media: \(media)") return .failure(.invalidMedia)
return .failure(.invalidMedia) }
}
do { do {
let data = try Data(contentsOf: imageURL) let data = try Data(contentsOf: imageURL)
return try .success(self.room.uploadAvatar(mimeType: mimeType, data: data, mediaInfo: nil)) return try await .success(room.uploadAvatar(mimeType: mimeType, data: data, mediaInfo: nil))
} catch { } catch {
MXLog.error("Failed uploading avatar with error: \(error)") MXLog.error("Failed uploading avatar with error: \(error)")
return .failure(.sdkError(error)) return .failure(.sdkError(error))
}
} }
} }
ElementX/Sources/Services/Room/RoomSummary/RoomSummaryProvider.swift
+4 -8
View File
@@ -193,7 +193,7 @@ class RoomSummaryProvider: RoomSummaryProviderProtocol {
return updatedItems return updatedItems
} }
private func fetchRoomInfo(roomListItem: RoomListItemProtocol) -> RoomInfo? { private func fetchRoomInfo(roomID: String) -> RoomInfo? {
class FetchResult { class FetchResult {
var roomInfo: RoomInfo? var roomInfo: RoomInfo?
} }
@@ -203,6 +203,7 @@ class RoomSummaryProvider: RoomSummaryProviderProtocol {
Task { Task {
do { do {
let roomListItem = try await roomListService.room(roomId: roomID)
result.roomInfo = try await roomListItem.roomInfo() result.roomInfo = try await roomListItem.roomInfo()
} catch { } catch {
MXLog.error("Failed fetching room info with error: \(error)") MXLog.error("Failed fetching room info with error: \(error)")
@@ -214,12 +215,7 @@ class RoomSummaryProvider: RoomSummaryProviderProtocol {
} }
private func buildRoomSummaryForIdentifier(_ identifier: String, invalidated: Bool) -> RoomSummary { private func buildRoomSummaryForIdentifier(_ identifier: String, invalidated: Bool) -> RoomSummary {
guard let roomListItem = try? roomListService.room(roomId: identifier) else { guard let roomInfo = fetchRoomInfo(roomID: identifier) else {
MXLog.error("\(name): Failed finding room with id: \(identifier)")
return .empty
}
guard let roomInfo = fetchRoomInfo(roomListItem: roomListItem) else {
return .empty return .empty
} }
@@ -242,7 +238,7 @@ class RoomSummaryProvider: RoomSummaryProviderProtocol {
let details = RoomSummaryDetails(id: roomInfo.id, let details = RoomSummaryDetails(id: roomInfo.id,
isInvite: roomInfo.membership == .invited, isInvite: roomInfo.membership == .invited,
inviter: inviterProxy, inviter: inviterProxy,
name: roomInfo.name ?? roomInfo.id, name: roomInfo.rawName ?? roomInfo.id,
isDirect: roomInfo.isDirect, isDirect: roomInfo.isDirect,
avatarURL: roomInfo.avatarUrl.flatMap(URL.init(string:)), avatarURL: roomInfo.avatarUrl.flatMap(URL.init(string:)),
lastMessage: attributedLastMessage, lastMessage: attributedLastMessage,
ElementX/Sources/Services/Timeline/TimelineProxy.swift
+51 -65
View File
@@ -21,9 +21,7 @@ import MatrixRustSDK
final class TimelineProxy: TimelineProxyProtocol { final class TimelineProxy: TimelineProxyProtocol {
private let timeline: Timeline private let timeline: Timeline
private let lowPriorityDispatchQueue = DispatchQueue(label: "io.element.elementx.roomproxy.low_priority", qos: .utility)
private let messageSendingDispatchQueue = DispatchQueue(label: "io.element.elementx.roomproxy.message_sending", qos: .userInitiated) private let messageSendingDispatchQueue = DispatchQueue(label: "io.element.elementx.roomproxy.message_sending", qos: .userInitiated)
private let userInitiatedDispatchQueue = DispatchQueue(label: "io.element.elementx.roomproxy.user_initiated", qos: .userInitiated)
private var backPaginationStatusObservationToken: TaskHandle? private var backPaginationStatusObservationToken: TaskHandle?
private var roomTimelineObservationToken: TaskHandle? private var roomTimelineObservationToken: TaskHandle?
@@ -104,40 +102,36 @@ final class TimelineProxy: TimelineProxyProtocol {
html: html, html: html,
intentionalMentions: intentionalMentions.toRustMentions()) intentionalMentions: intentionalMentions.toRustMentions())
return await Task.dispatch(on: messageSendingDispatchQueue) { do {
do { let originalEvent = try await timeline.getEventTimelineItemByEventId(eventId: eventID)
let originalEvent = try self.timeline.getEventTimelineItemByEventId(eventId: eventID) try await timeline.edit(newContent: messageContent, editItem: originalEvent)
try self.timeline.edit(newContent: messageContent, editItem: originalEvent)
MXLog.info("Finished editing message with original event ID: \(eventID)") MXLog.info("Finished editing message with original event ID: \(eventID)")
return .success(()) return .success(())
} catch { } catch {
MXLog.error("Failed editing message with original event ID: \(eventID) with error: \(error)") MXLog.error("Failed editing message with original event ID: \(eventID) with error: \(error)")
return .failure(.failedEditingMessage) return .failure(.failedEditingMessage)
}
} }
} }
func fetchDetails(for eventID: String) { func fetchDetails(for eventID: String) {
Task { Task {
await Task.dispatch(on: .global()) { do {
do { MXLog.info("Fetching event details for \(eventID)")
MXLog.info("Fetching event details for \(eventID)") try await self.timeline.fetchDetailsForEvent(eventId: eventID)
try self.timeline.fetchDetailsForEvent(eventId: eventID) MXLog.info("Finished fetching event details for eventID: \(eventID)")
MXLog.info("Finished fetching event details for eventID: \(eventID)") } catch {
} catch { MXLog.error("Failed fetching event details for eventID: \(eventID) with error: \(error)")
MXLog.error("Failed fetching event details for eventID: \(eventID) with error: \(error)")
}
} }
} }
} }
func messageEventContent(for eventID: String) -> RoomMessageEventContentWithoutRelation? { func messageEventContent(for eventID: String) async -> RoomMessageEventContentWithoutRelation? {
MXLog.info("Fetching event content for \(eventID)") MXLog.info("Fetching event content for \(eventID)")
do { do {
let result = try timeline.getTimelineEventContentByEventId(eventId: eventID) let result = try await timeline.getTimelineEventContentByEventId(eventId: eventID)
MXLog.info("Finished fetching event content for eventID: \(eventID)") MXLog.info("Finished fetching event content for eventID: \(eventID)")
return result return result
} catch { } catch {
@@ -366,30 +360,28 @@ final class TimelineProxy: TimelineProxyProtocol {
html: html, html: html,
intentionalMentions: intentionalMentions.toRustMentions()) intentionalMentions: intentionalMentions.toRustMentions())
return await Task.dispatch(on: messageSendingDispatchQueue) { do {
do { if let eventID {
if let eventID { let replyItem = try await timeline.getEventTimelineItemByEventId(eventId: eventID)
let replyItem = try self.timeline.getEventTimelineItemByEventId(eventId: eventID) try await timeline.sendReply(msg: messageContent, replyItem: replyItem)
try self.timeline.sendReply(msg: messageContent, replyItem: replyItem) MXLog.info("Finished sending reply to eventID: \(eventID)")
MXLog.info("Finished sending reply to eventID: \(eventID)") } else {
} else { timeline.send(msg: messageContent)
self.timeline.send(msg: messageContent) MXLog.info("Finished sending message")
MXLog.info("Finished sending message")
}
} catch {
if let eventID {
MXLog.error("Failed sending reply to eventID: \(eventID)")
} else {
MXLog.error("Failed sending message")
}
return .failure(.failedSendingMessage)
} }
} catch {
self.actionsSubject.send(.sentMessage) if let eventID {
MXLog.error("Failed sending reply to eventID: \(eventID)")
return .success(()) } else {
MXLog.error("Failed sending message")
}
return .failure(.failedSendingMessage)
} }
actionsSubject.send(.sentMessage)
return .success(())
} }
func sendMessageEventContent(_ messageContent: RoomMessageEventContentWithoutRelation) async -> Result<Void, TimelineProxyError> { func sendMessageEventContent(_ messageContent: RoomMessageEventContentWithoutRelation) async -> Result<Void, TimelineProxyError> {
@@ -409,30 +401,26 @@ final class TimelineProxy: TimelineProxyProtocol {
func sendReadReceipt(for eventID: String, type: ReceiptType) async -> Result<Void, TimelineProxyError> { func sendReadReceipt(for eventID: String, type: ReceiptType) async -> Result<Void, TimelineProxyError> {
MXLog.verbose("Sending read receipt for eventID: \(eventID)") MXLog.verbose("Sending read receipt for eventID: \(eventID)")
return await Task.dispatch(on: lowPriorityDispatchQueue) { do {
do { try await timeline.sendReadReceipt(receiptType: type, eventId: eventID)
try self.timeline.sendReadReceipt(receiptType: type, eventId: eventID) MXLog.info("Finished sending read receipt for eventID: \(eventID)")
MXLog.info("Finished sending read receipt for eventID: \(eventID)") return .success(())
return .success(()) } catch {
} catch { MXLog.error("Failed sending read receipt for eventID: \(eventID) with error: \(error)")
MXLog.error("Failed sending read receipt for eventID: \(eventID) with error: \(error)") return .failure(.failedSendingReadReceipt)
return .failure(.failedSendingReadReceipt)
}
} }
} }
func toggleReaction(_ reaction: String, to eventID: String) async -> Result<Void, TimelineProxyError> { func toggleReaction(_ reaction: String, to eventID: String) async -> Result<Void, TimelineProxyError> {
MXLog.info("Toggling reaction for eventID: \(eventID)") MXLog.info("Toggling reaction for eventID: \(eventID)")
return await Task.dispatch(on: userInitiatedDispatchQueue) { do {
do { try await timeline.toggleReaction(eventId: eventID, key: reaction)
try self.timeline.toggleReaction(eventId: eventID, key: reaction) MXLog.info("Finished toggling reaction for eventID: \(eventID)")
MXLog.info("Finished toggling reaction for eventID: \(eventID)") return .success(())
return .success(()) } catch {
} catch { MXLog.error("Failed toggling reaction for eventID: \(eventID)")
MXLog.error("Failed toggling reaction for eventID: \(eventID)") return .failure(.failedSendingReaction)
return .failure(.failedSendingReaction)
}
} }
} }
@@ -464,9 +452,7 @@ final class TimelineProxy: TimelineProxyProtocol {
MXLog.info("Editing poll with eventID: \(eventID)") MXLog.info("Editing poll with eventID: \(eventID)")
do { do {
let originalEvent = try await Task.dispatch(on: .global()) { let originalEvent = try await timeline.getEventTimelineItemByEventId(eventId: eventID)
try self.timeline.getEventTimelineItemByEventId(eventId: eventID)
}
try await timeline.editPoll(question: question, answers: answers, maxSelections: 1, pollKind: .init(pollKind: pollKind), editItem: originalEvent) try await timeline.editPoll(question: question, answers: answers, maxSelections: 1, pollKind: .init(pollKind: pollKind), editItem: originalEvent)
ElementX/Sources/Services/Timeline/TimelineProxyProtocol.swift
+1 -1
View File
@@ -57,7 +57,7 @@ protocol TimelineProxyProtocol {
func fetchDetails(for eventID: String) func fetchDetails(for eventID: String)
func messageEventContent(for eventID: String) -> RoomMessageEventContentWithoutRelation? func messageEventContent(for eventID: String) async -> RoomMessageEventContentWithoutRelation?
func retryDecryption(for sessionID: String) async func retryDecryption(for sessionID: String) async
ElementX/Sources/Services/UserSession/UserSessionStore.swift
+2 -4
View File
@@ -68,7 +68,7 @@ class UserSessionStore: UserSessionStoreProtocol {
func userSession(for client: Client, passphrase: String?) async -> Result<UserSessionProtocol, UserSessionStoreError> { func userSession(for client: Client, passphrase: String?) async -> Result<UserSessionProtocol, UserSessionStoreError> {
do { do {
let session = try client.session() let session = try await client.session()
let userID = try client.userId() let userID = try client.userId()
let clientProxy = await setupProxyForClient(client) let clientProxy = await setupProxyForClient(client)
@@ -133,9 +133,7 @@ class UserSessionStore: UserSessionStoreProtocol {
do { do {
let client = try await completeBuilder.build() let client = try await completeBuilder.build()
try await Task.dispatch(on: .global()) { try await client.restoreSession(session: credentials.restorationToken.session)
try client.restoreSession(session: credentials.restorationToken.session)
}
return await .success(setupProxyForClient(client)) return await .success(setupProxyForClient(client))
} catch { } catch {
NSE/Sources/Other/NSEUserSession.swift
+13 -18
View File
@@ -48,30 +48,25 @@ final class NSEUserSession {
baseClient = try await clientBuilder.build() baseClient = try await clientBuilder.build()
delegateHandle = baseClient.setDelegate(delegate: ClientDelegateWrapper()) delegateHandle = baseClient.setDelegate(delegate: ClientDelegateWrapper())
try baseClient.restoreSession(session: credentials.restorationToken.session) try await baseClient.restoreSession(session: credentials.restorationToken.session)
notificationClient = try baseClient notificationClient = try await baseClient.notificationClient(processSetup: .multipleProcesses)
.notificationClient(processSetup: .multipleProcesses)
.filterByPushRules()
.finish()
} }
func notificationItemProxy(roomID: String, eventID: String) async -> NotificationItemProxyProtocol? { func notificationItemProxy(roomID: String, eventID: String) async -> NotificationItemProxyProtocol? {
await Task.dispatch(on: .global()) { do {
do { let notification = try await notificationClient.getNotification(roomId: roomID, eventId: eventID)
let notification = try self.notificationClient.getNotification(roomId: roomID, eventId: eventID)
guard let notification else { guard let notification else {
return nil return nil
}
return NotificationItemProxy(notificationItem: notification,
eventID: eventID,
receiverID: self.userID,
roomID: roomID)
} catch {
MXLog.error("NSE: Could not get notification's content creating an empty notification instead, error: \(error)")
return EmptyNotificationItemProxy(eventID: eventID, roomID: roomID, receiverID: self.userID)
} }
return NotificationItemProxy(notificationItem: notification,
eventID: eventID,
receiverID: userID,
roomID: roomID)
} catch {
MXLog.error("NSE: Could not get notification's content creating an empty notification instead, error: \(error)")
return EmptyNotificationItemProxy(eventID: eventID, roomID: roomID, receiverID: userID)
} }
} }
UnitTests/Sources/RoomPollsHistoryScreenViewModelTests.swift
+1 -1
View File
@@ -139,7 +139,7 @@ class RoomPollsHistoryScreenViewModelTests: XCTestCase {
} }
func testSendPollResponse() async throws { func testSendPollResponse() async throws {
let deferred = deferFulfillment(interactionHandler.publisher) { _ in true } let deferred = deferFulfillment(interactionHandler.publisher.delay(for: 0.1, scheduler: DispatchQueue.main)) { _ in true }
interactionHandler.sendPollResponsePollStartIDOptionIDReturnValue = .success(()) interactionHandler.sendPollResponsePollStartIDOptionIDReturnValue = .success(())
viewModel.context.send(viewAction: .sendPollResponse(pollStartID: "somePollID", optionID: "someOptionID")) viewModel.context.send(viewAction: .sendPollResponse(pollStartID: "somePollID", optionID: "someOptionID"))
project.yml
+1 -1
View File
@@ -49,7 +49,7 @@ packages:
# Element/Matrix dependencies # Element/Matrix dependencies
MatrixRustSDK: MatrixRustSDK:
url: https://github.com/matrix-org/matrix-rust-components-swift url: https://github.com/matrix-org/matrix-rust-components-swift
exactVersion: 1.1.63 exactVersion: 1.1.64
# path: ../matrix-rust-sdk # path: ../matrix-rust-sdk
Compound: Compound:
url: https://github.com/element-hq/compound-ios url: https://github.com/element-hq/compound-ios