CringeStudios/element-desktop
5
0
Fork 1
mirror of https://github.com/element-hq/element-desktop synced 2025-04-21 09:03:56 +02:00
Code Issues Packages Projects Releases Wiki Activity

Iterate

Browse Source 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
This commit is contained in:
Michael Telatynski 2025-04-11 18:21:52 +01:00
parent a88f695390
commit 516c436d51
No known key found for this signature in database
GPG Key ID: A2B008A5F49F5D0D
2 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
playwright/e2e/launch/launch.spec.ts
View File

@ -51,7 +51,10 @@ test.describe("App launch", () => {
}); });
test.describe("safeStorage", () => { test.describe("safeStorage", () => {
test.skip(platform() === "linux", "The linux runner has no compatible wallet/keychain"); test.use({
extraArgs: ['--password-store="basic"'],
});
test.skip(platform() === "darwin", "The macOS runner's keychain is not available"); test.skip(platform() === "darwin", "The macOS runner's keychain is not available");
const userId = "@user:server"; const userId = "@user:server";
@ -67,6 +70,8 @@ test.describe("App launch", () => {
}); });
test.describe("migrate from keytar", () => { test.describe("migrate from keytar", () => {
test.skip(platform() === "win32", "Windows requires authentication to write to the store");
const pickleKey = "DEADBEEF1234"; const pickleKey = "DEADBEEF1234";
test.beforeEach(async () => { test.beforeEach(async () => {

16
src/electron-main.ts
View File

@ -355,6 +355,22 @@ 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 // 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"); app.commandLine.appendSwitch("disable-features", "HardwareMediaKeyHandling,MediaSessionService");
const SUPPORTED_ELECTRON_SWITCHES: string[] = [];
if (process.platform === "linux") {
SUPPORTED_ELECTRON_SWITCHES.push("password-store");
}
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. // Disable hardware acceleration if the setting has been set.
if (global.store.get("disableHardwareAcceleration") === true) { if (global.store.get("disableHardwareAcceleration") === true) {
console.log("Disabling hardware acceleration."); console.log("Disabling hardware acceleration.");