From 0a4190f83f5cb5afb026437cf9ba543aa4f64492 Mon Sep 17 00:00:00 2001
From: Scott Nonnenberg <scott@signal.org>
Date: Tue, 7 Jan 2020 13:29:57 -0800
Subject: [PATCH] handleDataMessage: Set convo preview after message processing

---
 js/models/messages.js | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/js/models/messages.js b/js/models/messages.js
index ea8087ced..f42b759de 100644
--- a/js/models/messages.js
+++ b/js/models/messages.js
@@ -1917,17 +1917,6 @@
             sticker: dataMessage.sticker,
           });
 
-          const conversationTimestamp = conversation.get('timestamp');
-          if (
-            !conversationTimestamp ||
-            message.get('sent_at') > conversationTimestamp
-          ) {
-            conversation.set({
-              lastMessage: message.getNotificationText(),
-              timestamp: message.get('sent_at'),
-            });
-          }
-
           const isSupported = !message.isUnsupportedMessage();
           if (!isSupported) {
             await message.eraseContents();
@@ -2151,6 +2140,17 @@
             }
           }
 
+          const conversationTimestamp = conversation.get('timestamp');
+          if (
+            !conversationTimestamp ||
+            message.get('sent_at') > conversationTimestamp
+          ) {
+            conversation.set({
+              lastMessage: message.getNotificationText(),
+              timestamp: message.get('sent_at'),
+            });
+          }
+
           MessageController.register(message.id, message);
           window.Signal.Data.updateConversation(
             conversationId,