Merge branch 'clearnet' of github.com:loki-project/loki-messenger into react-refactor

.github/workflows/pull-request.yml

@@ -75,8 +75,10 @@ jobs:
           sudo apt-get install -y hunspell-en-us
           sudo locale-gen en_US.UTF-8
           sudo dpkg-reconfigure locales
+          echo "::stop-commands::`echo -n ${{ github.token }} | sha256sum | head -c 64`"
           echo ::set-env name=DISPLAY:::9.0
           echo ::set-env name=LANG::en_US.UTF-8
+          echo "::`echo -n ${{ github.token }} | sha256sum | head -c 64`::"
 
       - name: Test
         uses: GabrielBB/xvfb-action@v1.0

package.json

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

preload.js

@@ -457,7 +457,7 @@ window.lokiFeatureFlags = {
   useOnionRequests: true,
   useOnionRequestsV2: true,
   useFileOnionRequests: true,
-  useFileOnionRequestsV2: false, // more compact encoding of files in response
+  useFileOnionRequestsV2: true, // more compact encoding of files in response
   enableSenderKeys: true,
   onionRequestHops: 3,
   debugMessageLogs: process.env.ENABLE_MESSAGE_LOGS,

ts/session/snode_api/onions.ts

@@ -142,7 +142,8 @@ async function buildOnionCtxs(
     if (relayingToFinalDestination && fileServerOptions) {
       let target = useV2 ? '/loki/v2/lsrpc' : '/loki/v1/lsrpc';
 
-      if (window.lokiFeatureFlags.useFileOnionRequestsV2) {
+      const isCallToPn = fileServerOptions?.host === 'live.apns.getsession.org';
+      if (!isCallToPn && window.lokiFeatureFlags.useFileOnionRequestsV2) {
         target = '/loki/v3/lsrpc';
       }