From 7fe6583608e539c471f7100e0eb6411dbe9ca3ab Mon Sep 17 00:00:00 2001 From: Maxim Shishmarev Date: Fri, 19 Jun 2020 17:03:33 +1000 Subject: [PATCH] Fix incorrect conversation id for incoming open group messages --- ts/receiver/receiver.ts | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/ts/receiver/receiver.ts b/ts/receiver/receiver.ts index 48bbd6908..08ccdb3b5 100644 --- a/ts/receiver/receiver.ts +++ b/ts/receiver/receiver.ts @@ -650,11 +650,9 @@ export async function handleMessageEvent(event: any): Promise { confirm(); return; } - } - - if (source !== ourNumber) { - // Ignore auth from our devices - conversationId = primarySource.key; + } else if (source !== ourNumber) { + // Ignore auth from our devices + conversationId = primarySource.key; } // the conversation with the primary device of that source (can be the same as conversationOrigin)