From fe63a9af8cf69b580566ffa22ac711e6eb60903f Mon Sep 17 00:00:00 2001
From: sachaaaaa <sacha@loki.network>
Date: Fri, 25 Jan 2019 11:17:24 +1100
Subject: [PATCH] always remove message from cache and return early when
 message.body is null

---
 libtextsecure/message_receiver.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/libtextsecure/message_receiver.js b/libtextsecure/message_receiver.js
index 313e6c430..ec8f380e2 100644
--- a/libtextsecure/message_receiver.js
+++ b/libtextsecure/message_receiver.js
@@ -954,11 +954,14 @@ MessageReceiver.prototype.extend({
             if (conversation && !message.flags) {
               const isFriendRequestAccept = await conversation.onFriendRequestAccepted();
               if (isFriendRequestAccept) {
-                await conversation.notifyFriendRequest(envelope.source, 'accepted');
-                this.removeFromCache(envelope);
-                return null;
+                await conversation.notifyFriendRequest(
+                  envelope.source,
+                  'accepted'
+                );
               }
             }
+            this.removeFromCache(envelope);
+            return null;
           }
 
           const ev = new Event('message');