From d4d3b5ad07288ed7979f09dc345f1ae3c4f20ecb Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 14 Apr 2025 15:16:23 +0100
Subject: [PATCH] Iterate

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 playwright/e2e/launch/launch.spec.ts | 11 +++++------
 src/electron-main.ts                 | 19 -------------------
 2 files changed, 5 insertions(+), 25 deletions(-)

diff --git a/playwright/e2e/launch/launch.spec.ts b/playwright/e2e/launch/launch.spec.ts
index a3adfb60..f6cfde65 100644
--- a/playwright/e2e/launch/launch.spec.ts
+++ b/playwright/e2e/launch/launch.spec.ts
@@ -51,11 +51,10 @@ test.describe("App launch", () => {
     });
 
     test.describe("safeStorage", () => {
-        test.use({
-            extraArgs: ['--password-store="basic"'],
-        });
-
-        test.skip(platform() === "darwin", "The macOS runner's keychain is not available");
+        if (process.env.GITHUB_ACTIONS) {
+            test.skip(platform() === "darwin", "The macOS runner's keychain is not available");
+            test.skip(platform() === "linux", "The Linux runner's dbus is not available");
+        }
 
         const userId = "@user:server";
         const deviceId = "ABCDEF";
@@ -70,7 +69,7 @@ test.describe("App launch", () => {
         });
 
         test.describe("migrate from keytar", () => {
-            // test.skip(platform() === "win32", "Windows requires authentication to write to the store");
+            test.skip(!!process.env.GITHUB_ACTIONS, "Does not work in CI");
 
             const pickleKey = "DEADBEEF1234";
 
diff --git a/src/electron-main.ts b/src/electron-main.ts
index 87cc4135..8dc83a31 100644
--- a/src/electron-main.ts
+++ b/src/electron-main.ts
@@ -366,25 +366,6 @@ app.enableSandbox();
 // We disable media controls here. We do this because calls use audio and video elements and they sometimes capture the media keys. See https://github.com/vector-im/element-web/issues/15704
 app.commandLine.appendSwitch("disable-features", "HardwareMediaKeyHandling,MediaSessionService");
 
-const SUPPORTED_ELECTRON_SWITCHES: string[] = [];
-
-if (process.platform === "linux") {
-    SUPPORTED_ELECTRON_SWITCHES.push("password-store");
-    if (process.env.CI) {
-        safeStorage.setUsePlainTextEncryption(true);
-    }
-}
-for (const switchKey of SUPPORTED_ELECTRON_SWITCHES) {
-    if (switchKey in argv) {
-        const switchValue = argv[switchKey];
-        if (switchValue === true) {
-            app.commandLine.appendSwitch(switchKey);
-        } else {
-            app.commandLine.appendSwitch(switchKey, switchValue);
-        }
-    }
-}
-
 // Disable hardware acceleration if the setting has been set.
 if (global.store.get("disableHardwareAcceleration") === true) {
     console.log("Disabling hardware acceleration.");