feat: Dont switch permanent keys for window closes, b=closes #12152, c=workflows, flatpak

.github/workflows/pr-test.yml

@@ -25,12 +25,12 @@ jobs:
         with:
           node-version-file: ".nvmrc"
 
-      - name: Run linting
-        run: npm run lint
-
       - name: Install dependencies
         run: npm ci
 
+      - name: Run linting
+        run: npm run lint
+
       - name: Download Firefox and dependencies
         env:
           ZEN_DOWNLOAD_DONT_INIT_GIT: "1"

build/flatpak/app.zen_browser.zen.yml.template

@@ -25,7 +25,6 @@ finish-args:
   - --filesystem=xdg-run/speech-dispatcher:ro
   - --device=all
   - --talk-name=org.freedesktop.FileManager1
-  - --talk-name=org.freedesktop.Notifications
   - --system-talk-name=org.freedesktop.NetworkManager
   - --talk-name=org.a11y.Bus
   - --talk-name=org.gtk.vfs.*

src/zen/sessionstore/ZenWindowSync.sys.mjs

@@ -734,12 +734,14 @@ class nsZenWindowSync {
         aOurTab.ownerGlobal.gBrowser.swapBrowsersAndCloseOther(aOurTab, aOtherTab, false);
 
         // Swap permanent keys
-        const ourPermanentKey = aOurTab.linkedBrowser.permanentKey;
-        const otherPermanentKey = aOtherTab.linkedBrowser.permanentKey;
-        aOurTab.linkedBrowser.permanentKey = otherPermanentKey;
-        aOtherTab.linkedBrowser.permanentKey = ourPermanentKey;
-        aOurTab.permanentKey = otherPermanentKey;
-        aOtherTab.permanentKey = ourPermanentKey;
+        if (!onClose) {
+          const ourPermanentKey = aOurTab.linkedBrowser.permanentKey;
+          const otherPermanentKey = aOtherTab.linkedBrowser.permanentKey;
+          aOurTab.linkedBrowser.permanentKey = otherPermanentKey;
+          aOtherTab.linkedBrowser.permanentKey = ourPermanentKey;
+          aOurTab.permanentKey = otherPermanentKey;
+          aOtherTab.permanentKey = ourPermanentKey;
+        }
 
         // Since we are moving progress listeners around, there's a chance that we
         // trigger a load while making the switch, and since we remove the previous