From fe3c73602f344763e2fc8eefe5391be582a6b665 Mon Sep 17 00:00:00 2001
From: Jonas Platte <jplatte@matrix.org>
Date: Thu, 2 Feb 2023 14:59:04 +0100
Subject: [PATCH] refactor(sdk): Always add UTD events to the timeline
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

… as currently this is the only way decryption can be retried.
---
 .../matrix-sdk/src/room/timeline/event_handler.rs  | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/crates/matrix-sdk/src/room/timeline/event_handler.rs b/crates/matrix-sdk/src/room/timeline/event_handler.rs
index 85d229ca2..b89fea9da 100644
--- a/crates/matrix-sdk/src/room/timeline/event_handler.rs
+++ b/crates/matrix-sdk/src/room/timeline/event_handler.rs
@@ -23,7 +23,7 @@ use ruma::{
         reaction::ReactionEventContent,
         relation::{Annotation, Replacement},
         room::{
-            encrypted::{self, RoomEncryptedEventContent},
+            encrypted::RoomEncryptedEventContent,
             member::{Change, RoomMemberEventContent},
             message::{self, MessageType, RoomMessageEventContent},
             redaction::{
@@ -439,16 +439,8 @@ impl<'a, 'i> TimelineEventHandler<'a, 'i> {
 
     #[instrument(skip_all)]
     fn handle_room_encrypted(&mut self, c: RoomEncryptedEventContent) {
-        match c.relates_to {
-            Some(encrypted::Relation::Replacement(_) | encrypted::Relation::Annotation(_)) => {
-                // Do nothing for these, as they would not produce a new
-                // timeline item when decrypted either
-                debug!("Ignoring aggregating event that failed to decrypt");
-            }
-            _ => {
-                self.add(NewEventTimelineItem::unable_to_decrypt(c));
-            }
-        }
+        // TODO: Handle replacements if the replaced event is also UTD
+        self.add(NewEventTimelineItem::unable_to_decrypt(c));
     }
 
     // Redacted redactions are no-ops (unfortunately)