From b092ed0a82a47f0acade7d9ee06a64f05ccace43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Thu, 2 Jul 2020 23:16:56 +0200
Subject: [PATCH] base: Put the decrypted event replacing in the correct place.

---
 matrix_sdk_base/src/client.rs | 43 ++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 24 deletions(-)

diff --git a/matrix_sdk_base/src/client.rs b/matrix_sdk_base/src/client.rs
index fac9e3ac..2e72b95b 100644
--- a/matrix_sdk_base/src/client.rs
+++ b/matrix_sdk_base/src/client.rs
@@ -707,23 +707,25 @@ impl BaseClient {
         &self,
         room_id: &RoomId,
         event: &mut EventJson<RoomEvent>,
-    ) -> Result<(Option<EventJson<RoomEvent>>, bool)> {
+    ) -> Result<bool> {
         match event.deserialize() {
             #[allow(unused_mut)]
             Ok(mut e) => {
-                #[cfg(feature = "encryption")]
-                let mut decrypted_event = None;
-                #[cfg(not(feature = "encryption"))]
-                let decrypted_event = None;
-
                 #[cfg(feature = "encryption")]
                 {
-                    if let RoomEvent::RoomEncrypted(ref mut e) = e {
-                        e.room_id = Some(room_id.to_owned());
+                    if let RoomEvent::RoomEncrypted(ref mut encrypted_event) = e {
+                        encrypted_event.room_id = Some(room_id.to_owned());
                         let mut olm = self.olm.lock().await;
 
                         if let Some(o) = &mut *olm {
-                            decrypted_event = o.decrypt_room_event(&e).await.ok();
+                            if let Some(decrypted) =
+                                o.decrypt_room_event(&encrypted_event).await.ok()
+                            {
+                                if let Ok(d) = decrypted.deserialize() {
+                                    e = d
+                                }
+                                *event = decrypted;
+                            }
                         }
                     }
                 }
@@ -741,12 +743,12 @@ impl BaseClient {
                         self.invalidate_group_session(room_id).await;
                     }
 
-                    Ok((decrypted_event, changed))
+                    Ok(changed)
                 } else {
-                    Ok((decrypted_event, room.receive_timeline_event(&e)))
+                    Ok(room.receive_timeline_event(&e))
                 }
             }
-            _ => Ok((None, false)),
+            _ => Ok(false),
         }
     }
 
@@ -1014,20 +1016,13 @@ impl BaseClient {
                 .set_unread_notice_count(&joined_room.unread_notifications);
 
             for mut event in &mut joined_room.timeline.events {
-                let decrypted_event = {
-                    let (decrypt_ev, timeline_update) = self
-                        .receive_joined_timeline_event(room_id, &mut event)
-                        .await?;
-                    if timeline_update {
-                        updated = true;
-                    };
-                    decrypt_ev
+                let timeline_update = self
+                    .receive_joined_timeline_event(room_id, &mut event)
+                    .await?;
+                if timeline_update {
+                    updated = true;
                 };
 
-                if let Some(e) = decrypted_event {
-                    *event = e;
-                }
-
                 // XXX: Related to `prev_content` and `unsigned`; see the doc comment of
                 // `hoist_room_event_prev_content`
                 if let Some(e) = hoist_room_event_prev_content(event) {