From dd3080d9feb348c3c13fa83b5cdf71b12d8a9f83 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Mon, 20 Jul 2020 09:46:05 +1000
Subject: [PATCH] mark conversation as secondary on message synced when needed

---
 password_preload.js        |  2 +-
 ts/receiver/dataMessage.ts | 15 ++++++++++++++-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/password_preload.js b/password_preload.js
index d499b1609..bd18b92db 100644
--- a/password_preload.js
+++ b/password_preload.js
@@ -32,7 +32,7 @@ window.Signal = {
   Components: {
     SessionPasswordPrompt,
   },
-}
+};
 
 window.CONSTANTS = {
   MAX_LOGIN_TRIES: 3,
diff --git a/ts/receiver/dataMessage.ts b/ts/receiver/dataMessage.ts
index 24de0c604..b55439fbd 100644
--- a/ts/receiver/dataMessage.ts
+++ b/ts/receiver/dataMessage.ts
@@ -631,7 +631,20 @@ export async function handleMessageEvent(event: MessageEvent): Promise<void> {
     );
   }
 
-  await window.ConversationController.getOrCreateAndWait(conversationId, type);
+  const conv = await window.ConversationController.getOrCreateAndWait(
+    conversationId,
+    type
+  );
+  if (!isGroupMessage && !isIncoming) {
+    const primaryDestination = await MultiDeviceProtocol.getPrimaryDevice(
+      destination
+    );
+
+    if (destination !== primaryDestination.key) {
+      // mark created conversation as secondary if this is one
+      conv.setSecondaryStatus(true, primaryDestination.key);
+    }
+  }
 
   // =========== Process flags =============