ehealthsolutions/element-x-ios
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/element-x-ios.git synced 2026-11-02 21:33:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update Matrix SDK to 1.1.23 (#1890)

Browse Source
This commit is contained in:
Alfonso Grillo
2023-10-13 14:31:22 +02:00
committed by GitHub
parent 293834cf94
commit f97a7c8cce
6 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ElementX.xcodeproj/project.pbxproj
+1 -1
View File
@@ -5990,7 +5990,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.22; version = 1.1.23;
}; };
}; };
821C67C9A7F8CC3FD41B28B4 /* XCRemoteSwiftPackageReference "emojibase-bindings" */ = { 821C67C9A7F8CC3FD41B28B4 /* XCRemoteSwiftPackageReference "emojibase-bindings" */ = {
ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
+2 -2
View File
@@ -120,8 +120,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" : "9895254e2da70cac3140069d39b7d07f18ff54c0", "revision" : "c5ca416942b4a4af82126ac2bf7f08ef7af5bb19",
"version" : "1.1.22" "version" : "1.1.23"
} }
}, },
{ {
ElementX/Sources/Services/Room/RoomSummary/RoomEventStringBuilder.swift
+1 -4
View File
@@ -46,10 +46,7 @@ struct RoomEventStringBuilder {
fatalError("Invalid message timeline item: \(eventItemProxy)") fatalError("Invalid message timeline item: \(eventItemProxy)")
} }
guard let messageType = messageContent.msgtype() else { let messageType = messageContent.msgtype()
return prefix(messageContent.body(), with: senderDisplayName)
}
return messageEventStringBuilder.buildAttributedString(for: messageType, senderDisplayName: senderDisplayName, prefixWithSenderName: true) return messageEventStringBuilder.buildAttributedString(for: messageType, senderDisplayName: senderDisplayName, prefixWithSenderName: true)
case .state(let stateKey, let state): case .state(let stateKey, let state):
return stateEventStringBuilder return stateEventStringBuilder
ElementX/Sources/Services/Room/RoomSummary/RoomMessageEventStringBuilder.swift
+3 -1
View File
@@ -54,8 +54,10 @@ struct RoomMessageEventStringBuilder {
} else { } else {
message = content.body message = content.body
} }
case .other(_, let body):
message = body
} }
if prefixWithSenderName { if prefixWithSenderName {
return prefix(message, with: senderDisplayName) return prefix(message, with: senderDisplayName)
} else { } else {
ElementX/Sources/Services/Timeline/TimelineItems/RoomTimelineItemFactory.swift
+2 -2
View File
@@ -105,7 +105,7 @@ struct RoomTimelineItemFactory: RoomTimelineItemFactoryProtocol {
} }
case .location(let content): case .location(let content):
return buildLocationTimelineItem(for: eventItemProxy, messageTimelineItem, content, isOutgoing, isThreaded) return buildLocationTimelineItem(for: eventItemProxy, messageTimelineItem, content, isOutgoing, isThreaded)
case .none: case .other:
return nil return nil
} }
} }
@@ -653,7 +653,7 @@ struct RoomTimelineItemFactory: RoomTimelineItemFactoryProtocol {
replyContent = .video(buildVideoTimelineItemContent(content)) replyContent = .video(buildVideoTimelineItemContent(content))
case .location(let content): case .location(let content):
replyContent = .location(buildLocationTimelineItemContent(content)) replyContent = .location(buildLocationTimelineItemContent(content))
case .none: case .other, .none:
replyContent = .text(.init(body: L10n.commonUnsupportedEvent)) replyContent = .text(.init(body: L10n.commonUnsupportedEvent))
} }
case .poll(let question, _, _, _, _, _): case .poll(let question, _, _, _, _, _):
project.yml
+1 -1
View File
@@ -46,7 +46,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.22 exactVersion: 1.1.23
# path: ../matrix-rust-sdk # path: ../matrix-rust-sdk
Compound: Compound:
url: https://github.com/vector-im/compound-ios url: https://github.com/vector-im/compound-ios