Merge remote-tracking branch 'upstream/clearnet' into restore-handle-configuration

package.json

@@ -2,7 +2,7 @@
   "name": "session-desktop",
   "productName": "Session",
   "description": "Private messaging from your desktop",
-  "version": "1.4.10",
+  "version": "1.4.11",
   "license": "GPL-3.0",
   "author": {
     "name": "Loki Project",

ts/receiver/closedGroups.ts

@@ -236,6 +236,7 @@ export async function handleNewClosedGroup(
     members: members,
     admins,
     active: true,
+    weWereJustAdded: true,
   };
 
   // be sure to call this before sending the message.
@@ -521,7 +522,8 @@ async function performIfValid(
     lastJoinedTimestamp = aYearAgo;
   }
 
-  if (envelope.timestamp <= lastJoinedTimestamp) {
+  const envelopeTimestamp = _.toNumber(envelope.timestamp);
+  if (envelopeTimestamp <= lastJoinedTimestamp) {
     window.log.warn(
       'Got a group update with an older timestamp than when we joined this group last time. Dropping it.'
     );

ts/session/group/index.ts

@@ -45,6 +45,7 @@ export interface GroupInfo {
   blocked?: boolean;
   admins?: Array<string>;
   secretKey?: Uint8Array;
+  weWereJustAdded?: boolean;
 }
 
 interface UpdatableGroupState {
@@ -247,7 +248,7 @@ export function buildGroupDiff(
 }
 
 export async function updateOrCreateClosedGroup(details: GroupInfo) {
-  const { id } = details;
+  const { id, weWereJustAdded } = details;
 
   const conversation = await ConversationController.getInstance().getOrCreateAndWait(
     id,
@@ -272,7 +273,9 @@ export async function updateOrCreateClosedGroup(details: GroupInfo) {
       updates.timestamp = updates.active_at;
     }
     updates.left = false;
-    updates.lastJoinedTimestamp = updates.active_at;
+    updates.lastJoinedTimestamp = weWereJustAdded
+      ? Date.now()
+      : updates.active_at;
   } else {
     updates.left = true;
   }

ts/session/messages/outgoing/content/data/ChatMessage.ts

@@ -98,10 +98,10 @@ export class ChatMessage extends DataMessage {
   ) {
     if (
       (dataMessage as any).constructor.name !== 'DataMessage' &&
-      !(dataMessage instanceof DataMessage)
+      !(dataMessage instanceof SignalService.DataMessage)
     ) {
-      throw new Error(
-        'Tried to build a sync message from something else than a DataMessage'
+      window.log.warn(
+        'buildSyncMessage with something else than a DataMessage'
       );
     }
 

ts/session/utils/syncUtils.ts

@@ -62,34 +62,24 @@ export const forceSyncConfigurationNowIfNeeded = async (
 ) =>
   new Promise(resolve => {
     const allConvos = ConversationController.getInstance().getConversations();
+
     void getCurrentConfigurationMessage(allConvos)
       .then(configMessage => {
         // console.warn('forceSyncConfigurationNowIfNeeded with', configMessage);
 
-        try {
-          // this just adds the message to the sending queue.
-          // if waitForMessageSent is set, we need to effectively wait until then
-          // tslint:disable-next-line: no-void-expression
-          const callback = waitForMessageSent
-            ? () => {
-                resolve(true);
-              }
-            : undefined;
-          void getMessageQueue().sendSyncMessage(
-            configMessage,
-            callback as any
-          );
-          // either we resolve from the callback if we need to wait for it,
-          // or we don't want to wait, we resolve it here.
-          if (!waitForMessageSent) {
-            resolve(true);
-          }
-        } catch (e) {
-          window.log.warn(
-            'Caught an error while sending our ConfigurationMessage:',
-            e
-          );
-          resolve(false);
+        // this just adds the message to the sending queue.
+        // if waitForMessageSent is set, we need to effectively wait until then
+        // tslint:disable-next-line: no-void-expression
+        const callback = waitForMessageSent
+          ? () => {
+              resolve(true);
+            }
+          : undefined;
+        void getMessageQueue().sendSyncMessage(configMessage, callback as any);
+        // either we resolve from the callback if we need to wait for it,
+        // or we don't want to wait, we resolve it here.
+        if (!waitForMessageSent) {
+          resolve(true);
         }
       })
       .catch(e => {

ts/test/session/unit/utils/Promise_test.ts

@@ -122,7 +122,7 @@ describe('Promise Utils', () => {
 
       expect(waitForTaskSpy.callCount).to.equal(1);
       expect(completionSpy.callCount).to.equal(0);
-      return promise.should.eventually.be.rejectedWith('Task timed out.');
+      return promise.should.eventually.be.rejectedWith('Task timed out');
     });
   });