Fix incorrect conversation id for incoming open group messages

5 years ago · 7fe6583608
parent bbea23ed7c
commit 7fe6583608
1 changed files with 3 additions and 5 deletions
--- a/ts/receiver/receiver.ts
+++ b/ts/receiver/receiver.ts
@ -650,11 +650,9 @@ export async function handleMessageEvent(event: any): Promise<void> {
      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)