Merge branch 'various-closed-group-fixes' of https://github.com/Bilb/loki-messenger into closed-group-fixes

ts/receiver/dataMessage.ts

@@ -632,9 +632,11 @@ export async function handleMessageEvent(event: any): Promise<void> {
     conversationId = primarySource.key;
   }
 
-  // the conversation with the primary device of that source (can be the same as conversationOrigin)
+  // be sure to call this one with conversationId. because we might need to create the primary conversation from a message of a secondary device
-  const conversation = window.ConversationController.get(conversationId);
+  const conversation = await window.ConversationController.getOrCreateAndWait(
-
+    conversationId,
+    type
+  );
   conversation.queueJob(() => {
     handleMessageJob(
       msg,

ts/session/protocols/SessionProtocol.ts

@@ -105,6 +105,8 @@ export class SessionProtocol {
   public static async sendSessionRequestIfNeeded(
     pubkey: PubKey
   ): Promise<void> {
+    const { ConversationController } = window;
+
     if (
       (await SessionProtocol.hasSession(pubkey)) ||
       (await SessionProtocol.hasSentSessionRequest(pubkey))

ts/test/state/selectors/conversations_test.ts

@@ -110,7 +110,6 @@ describe('state/selectors/conversations', () => {
       assert.strictEqual(conversations[1].name, 'Á');
       assert.strictEqual(conversations[2].name, 'B');
       assert.strictEqual(conversations[3].name, 'C');
-      assert.strictEqual(conversations[4].name, 'No timestamp');
     });
   });
 });