Merge branch 'main' of https://github.com/bepass-org/oblivion-desktop

bepass-org · Jul 13, 2024 · 533d974 · 533d974
2 parents b0cd6df + 1472baf
commit 533d974
Showing 1 changed file with 22 additions and 1 deletion.
diff --git a/src/main/lib/proxy.ts b/src/main/lib/proxy.ts
@@ -95,8 +95,16 @@ const enableGnomeProxy = async (ip: string, port: string, routingRules: any): Pr
     try {
         await execPromise(`gsettings set org.gnome.system.proxy mode '${proxySettings.mode}'`);
 
+        // reset other proxies in case user set it
+        await execPromise(`gsettings set org.gnome.system.proxy.http host ""`);
+        await execPromise(`gsettings set org.gnome.system.proxy.http port 0`);
+        await execPromise(`gsettings set org.gnome.system.proxy.https host ""`);
+        await execPromise(`gsettings set org.gnome.system.proxy.https port 0`);
+        await execPromise(`gsettings set org.gnome.system.proxy.ftp host ""`);
+        await execPromise(`gsettings set org.gnome.system.proxy.ftp port 0`);
+
+        // set socks proxy
         await execPromise(`gsettings set org.gnome.system.proxy.socks host ${proxySettings.host}`);
-
         await execPromise(`gsettings set org.gnome.system.proxy.socks port ${proxySettings.port}`);
 
         // https://wiki.archlinux.org/title/Proxy_server#Proxy_settings_on_GNOME3
@@ -146,6 +154,19 @@ const enableKDEProxy = async (
         await execPromise(
             `kwriteconfig${v} --file kioslaverc --group "Proxy Settings" --key ProxyType 1`
         );
+
+        // reset other proxies in case user set it
+        await execPromise(
+            `kwriteconfig${v} --file kioslaverc --group "Proxy Settings" --key httpProxy '':0`
+        );
+        await execPromise(
+            `kwriteconfig${v} --file kioslaverc --group "Proxy Settings" --key httpsProxy '':0`
+        );
+        await execPromise(
+            `kwriteconfig${v} --file kioslaverc --group "Proxy Settings" --key ftpProxy '':0`
+        );
+
+        // set socks proxy
         await execPromise(
             `kwriteconfig${v} --file kioslaverc --group "Proxy Settings" --key socksProxy "${host}:${port}"`
         );