Merge remote-tracking branch 'upstream/master' into dev

Author: Bilb

.github/workflows/build-binaries.yml

@@ -93,22 +93,29 @@ jobs:
             electron_target: deb
             cache_suffix: linux-deb
             is_qa: false
+            generate_release_metadata: true
           - identifier: rpm
             electron_target: rpm
             cache_suffix: linux-rpm
             is_qa: false
-          - identifier: freebsd
-            electron_target: freebsd
-            cache_suffix: linux-freebsd
-            is_qa: false
+            generate_release_metadata: true
           - identifier: AppImage
             electron_target: AppImage
             cache_suffix: linux-AppImage
             is_qa: false
-          - identifier: deb-qa
-            electron_target: deb
-            cache_suffix: linux-deb
-            is_qa: true
+            generate_release_metadata: true
+          - identifier: freebsd
+            electron_target: freebsd
+            cache_suffix: linux-freebsd
+            is_qa: false
+            generate_release_metadata: false
+          # Note: this deb-qa is currently broken. The deb and deb-qa are currently overwriting each others
+          # during build-release-publish and maybe the upload-artefact too.
+          # - identifier: deb-qa
+          #   electron_target: deb
+          #   cache_suffix: linux-deb
+          #   is_qa: true
+          #   generate_release_metadata: false
     name: '${{ matrix.identifier }}'
 
     env:
@@ -164,15 +171,15 @@ jobs:
         # only run this on "push" to "master" or alpha releases
         # Note: The jobs are overwriting each other's latest-linux.yml.
         # So, we upload all of them as artifacts, and then merge them (see `post_build_linux`)
-        # note: freebsd does not generate a latest-linux.yml file so we exclude it
-        if: ${{ needs.create_draft_release_if_needed.outputs.version_tag != '' && matrix.identifier != 'freebsd' }}
+        # note: freebsd does not generate a latest-linux.yml file so we exclude it, same for the deb-qa build
+        if: ${{ needs.create_draft_release_if_needed.outputs.version_tag != '' && matrix.generate_release_metadata == true }}
         shell: bash
         run: |
           mv dist/latest-linux.yml dist/latest-linux-${{ matrix.electron_target }}-${{ github.sha }}.yml
 
       - name: Upload release metadata
         # only run this on "push" to "master" or alpha releases
-        if: ${{ needs.create_draft_release_if_needed.outputs.version_tag != '' && matrix.identifier != 'freebsd' }}
+        if: ${{ needs.create_draft_release_if_needed.outputs.version_tag != '' && matrix.generate_release_metadata == true }}
         uses: actions/upload-artifact@v4
         with:
           name: latest-linux-${{ matrix.electron_target }}-${{ github.sha }}.yml

package.json

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

ts/components/menuAndSettingsHooks/useShowUserDetailsCb.ts

@@ -60,7 +60,7 @@ export function useShowUserDetailsCbFromMessage() {
         resolvedNakedId && resolvedNakedId !== sender ? resolvedNakedId : undefined;
     }
 
-    if (foundRealSessionId && foundRealSessionId.startsWith(KeyPrefixType.standard)) {
+    if (!foundRealSessionId || foundRealSessionId.startsWith(KeyPrefixType.blinded15)) {
       await ConvoHub.use().get(sender).setOriginConversationID(selectedConvoKey, true);
     }
 

ts/mains/main_node.ts

@@ -45,7 +45,12 @@ const getRealPath = (p: string) => fs.realpathSync(p);
 app.commandLine.appendSwitch('disable-renderer-backgrounding');
 app.commandLine.appendSwitch('disable-background-timer-throttling');
 app.commandLine.appendSwitch('disable-backgrounding-occluded-windows');
-powerSaveBlocker.start('prevent-app-suspension');
+if (!process.env.SESSION_ALLOW_APP_SUSPENSION) {
+  console.log('SESSION_ALLOW_APP_SUSPENSION is not set, so we prevent app suspension');
+  powerSaveBlocker.start('prevent-app-suspension');
+} else {
+  console.log('SESSION_ALLOW_APP_SUSPENSION is set, so we do not prevent app suspension');
+}
 
 // Hardcoding appId to prevent build failures on release.
 // const appUserModelId = packageJson.build.appId;