Merge remote-tracking branch 'upstream/unstable' into qa/release/1.15.0-2

.github/workflows/build-binaries.yml

@@ -119,7 +119,7 @@ jobs:
   # We want a mac arm64 build, and according to this https://github.com/actions/runner-images#available-images macos-14 is always arm64
   # macos-14 is disabled for now as we hit our free tier limit for macos builds
   build_macos_x64:
-    runs-on: macos-12
+    runs-on: macos-13
     env:
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       MAC_CERTIFICATE: ${{ secrets.MAC_CERTIFICATE }}

INTERNALBUILDS.md

@@ -80,7 +80,6 @@ Building on windows should work straight out of the box, but if it fails then yo
 
 ```
 npm install --global --production windows-build-tools@4.0.0
-npm install --global node-gyp@latest
 npm config set python python2.7
 npm config set msvs_version 2015
 ```

actions/setup_and_build/action.yml

@@ -22,12 +22,6 @@ runs:
       uses: microsoft/setup-msbuild@v2
       if: runner.os == 'Windows'
 
-    - name: Setup node for windows
-      if: runner.os == 'Windows'
-      shell: bash
-      run: |
-        yarn global add node-gyp@latest
-
     - uses: actions/cache/restore@v4
       id: cache-desktop-modules
       with:

package.json

@@ -2,7 +2,7 @@
   "name": "session-desktop",
   "productName": "Session",
   "description": "Private messaging from your desktop",
-  "version": "1.15.0",
+  "version": "1.14.3",
   "license": "GPL-3.0",
   "author": {
     "name": "Session Foundation",

stylesheets/_session_theme.scss

@@ -65,7 +65,6 @@
       flex-direction: row;
       align-items: center;
 
-
       a {
         text-decoration: underline;
         color: var(--message-bubbles-received-text-color);

ts/components/basic/SessionToast.tsx

@@ -1,4 +1,4 @@
-import {  noop } from 'lodash';
+import { noop } from 'lodash';
 
 import styled from 'styled-components';
 
@@ -38,8 +38,6 @@ const IconDiv = styled.div`
   margin: 0 var(--margins-sm) 0 var(--margins-xs);
 `;
 
-
-
 function DescriptionPubkeysReplaced({ description }: { description: string }) {
   return (
     <DescriptionDiv>

ts/interactions/conversationInteractions.ts

@@ -113,9 +113,12 @@ export const handleAcceptConversationRequest = async ({
   approvalMessageTimestamp: number;
 }) => {
   const convo = ConvoHub.use().get(convoId);
-  if (!convo || (!convo.isPrivate() && !convo.isClosedGroupV2())) {
+  if (!convo || convo.isApproved() || (!convo.isPrivate() && !convo.isClosedGroupV2())) {
+    window?.log?.info('Conversation is already approved or not private/03group');
+
     return null;
   }
+
   const previousIsApproved = convo.isApproved();
   const previousDidApprovedMe = convo.didApproveMe();
   // Note: we don't mark as approvedMe = true, as we do not know if they did send us a message yet.

ts/session/utils/calling/CallManager.ts

@@ -35,6 +35,7 @@ import { getBlackSilenceMediaStream } from './Silence';
 import { ed25519Str } from '../String';
 import { WithMessageHash } from '../../types/with';
 import { NetworkTime } from '../../../util/NetworkTime';
+import { sleepFor } from '../Promise';
 
 export type InputItem = { deviceId: string; label: string };
 
@@ -533,6 +534,10 @@ export async function USER_callRecipient(recipient: string) {
   calledConvo.set('active_at', Date.now()); // addSingleOutgoingMessage does the commit for us on the convo
   await calledConvo.unhideIfNeeded(false);
   weAreCallerOnCurrentCall = true;
+  // Not ideal, but also temporary (see you in 2 years).
+  // We need to make sure the preoffer AND the messageRequestResponse sent in
+  // approveConvoAndSendResponse have different timestamps, as iOS will throw an error otherwise
+  await sleepFor(2);
 
   // initiating a call is analogous to sending a message request
   await handleAcceptConversationRequest({

ts/test/session/unit/utils/job_runner/group_sync_job/GroupSyncJob_test.ts

@@ -57,7 +57,7 @@ function validUserGroup03WithSecKey(pubkey?: GroupPubkeyType) {
     secretKey: new Uint8Array(30),
     destroyed: false,
     invitePending: false,
-    joinedAtSeconds: Math.floor(Date.now()/1000),
+    joinedAtSeconds: Math.floor(Date.now() / 1000),
     kicked: false,
     priority: 0,
     pubkeyHex: pubkey || TestUtils.generateFakeClosedGroupV2PkStr(),