From 632de4e9c73ef14fb4ff5906792c91222e690c1f Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Wed, 20 May 2020 11:50:55 +1000
Subject: [PATCH] handleDataMessage: handle messages as coming from
 primaryDevice

---
 js/models/messages.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/js/models/messages.js b/js/models/messages.js
index bb81814d0..7a56660f6 100644
--- a/js/models/messages.js
+++ b/js/models/messages.js
@@ -2119,7 +2119,7 @@
       //      still go through one of the previous two codepaths
       const ourNumber = textsecure.storage.user.getNumber();
       const message = this;
-      const source = message.get('source');
+      let source = message.get('source');
       let conversationId = message.get('conversationId');
       const authorisation = await libloki.storage.getGrantAuthorisationForSecondaryPubKey(
         source
@@ -2201,6 +2201,7 @@
         }
       }
       const conversation = conversationPrimary;
+      source = primarySource;
 
       return conversation.queueJob(async () => {
         window.log.info(