From f97a7c8ccefc0cfeb3c6a854562ecec1fbdaddf9 Mon Sep 17 00:00:00 2001
From: Alfonso Grillo <alfogrillo@gmail.com>
Date: Fri, 13 Oct 2023 14:31:22 +0200
Subject: [PATCH] Update Matrix SDK to 1.1.23 (#1890)

---
 ElementX.xcodeproj/project.pbxproj                           | 2 +-
 .../xcshareddata/swiftpm/Package.resolved                    | 4 ++--
 .../Services/Room/RoomSummary/RoomEventStringBuilder.swift   | 5 +----
 .../Room/RoomSummary/RoomMessageEventStringBuilder.swift     | 4 +++-
 .../Timeline/TimelineItems/RoomTimelineItemFactory.swift     | 4 ++--
 project.yml                                                  | 2 +-
 6 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/ElementX.xcodeproj/project.pbxproj b/ElementX.xcodeproj/project.pbxproj
index 1bb478435..053743a12 100644
--- a/ElementX.xcodeproj/project.pbxproj
+++ b/ElementX.xcodeproj/project.pbxproj
@@ -5990,7 +5990,7 @@
 			repositoryURL = "https://github.com/matrix-org/matrix-rust-components-swift";
 			requirement = {
 				kind = exactVersion;
-				version = 1.1.22;
+				version = 1.1.23;
 			};
 		};
 		821C67C9A7F8CC3FD41B28B4 /* XCRemoteSwiftPackageReference "emojibase-bindings" */ = {
diff --git a/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
index 36026c369..6c3ca7c05 100644
--- a/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
+++ b/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -120,8 +120,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/matrix-org/matrix-rust-components-swift",
       "state" : {
-        "revision" : "9895254e2da70cac3140069d39b7d07f18ff54c0",
-        "version" : "1.1.22"
+        "revision" : "c5ca416942b4a4af82126ac2bf7f08ef7af5bb19",
+        "version" : "1.1.23"
       }
     },
     {
diff --git a/ElementX/Sources/Services/Room/RoomSummary/RoomEventStringBuilder.swift b/ElementX/Sources/Services/Room/RoomSummary/RoomEventStringBuilder.swift
index ad81543a6..88735c2f8 100644
--- a/ElementX/Sources/Services/Room/RoomSummary/RoomEventStringBuilder.swift
+++ b/ElementX/Sources/Services/Room/RoomSummary/RoomEventStringBuilder.swift
@@ -46,10 +46,7 @@ struct RoomEventStringBuilder {
                 fatalError("Invalid message timeline item: \(eventItemProxy)")
             }
             
-            guard let messageType = messageContent.msgtype() else {
-                return prefix(messageContent.body(), with: senderDisplayName)
-            }
-            
+            let messageType = messageContent.msgtype()
             return messageEventStringBuilder.buildAttributedString(for: messageType, senderDisplayName: senderDisplayName, prefixWithSenderName: true)
         case .state(let stateKey, let state):
             return stateEventStringBuilder
diff --git a/ElementX/Sources/Services/Room/RoomSummary/RoomMessageEventStringBuilder.swift b/ElementX/Sources/Services/Room/RoomSummary/RoomMessageEventStringBuilder.swift
index 008a187e8..926151353 100644
--- a/ElementX/Sources/Services/Room/RoomSummary/RoomMessageEventStringBuilder.swift
+++ b/ElementX/Sources/Services/Room/RoomSummary/RoomMessageEventStringBuilder.swift
@@ -54,8 +54,10 @@ struct RoomMessageEventStringBuilder {
             } else {
                 message = content.body
             }
+        case .other(_, let body):
+            message = body
         }
-        
+
         if prefixWithSenderName {
             return prefix(message, with: senderDisplayName)
         } else {
diff --git a/ElementX/Sources/Services/Timeline/TimelineItems/RoomTimelineItemFactory.swift b/ElementX/Sources/Services/Timeline/TimelineItems/RoomTimelineItemFactory.swift
index 5befc9bed..526d2d285 100644
--- a/ElementX/Sources/Services/Timeline/TimelineItems/RoomTimelineItemFactory.swift
+++ b/ElementX/Sources/Services/Timeline/TimelineItems/RoomTimelineItemFactory.swift
@@ -105,7 +105,7 @@ struct RoomTimelineItemFactory: RoomTimelineItemFactoryProtocol {
             }
         case .location(let content):
             return buildLocationTimelineItem(for: eventItemProxy, messageTimelineItem, content, isOutgoing, isThreaded)
-        case .none:
+        case .other:
             return nil
         }
     }
@@ -653,7 +653,7 @@ struct RoomTimelineItemFactory: RoomTimelineItemFactoryProtocol {
                     replyContent = .video(buildVideoTimelineItemContent(content))
                 case .location(let content):
                     replyContent = .location(buildLocationTimelineItemContent(content))
-                case .none:
+                case .other, .none:
                     replyContent = .text(.init(body: L10n.commonUnsupportedEvent))
                 }
             case .poll(let question, _, _, _, _, _):
diff --git a/project.yml b/project.yml
index a416d536b..4072bba98 100644
--- a/project.yml
+++ b/project.yml
@@ -46,7 +46,7 @@ packages:
   # Element/Matrix dependencies
   MatrixRustSDK:
     url: https://github.com/matrix-org/matrix-rust-components-swift
-    exactVersion: 1.1.22
+    exactVersion: 1.1.23
     # path: ../matrix-rust-sdk
   Compound:
     url: https://github.com/vector-im/compound-ios