CringeStudios/element-desktop
5
0
Fork 1
mirror of https://github.com/element-hq/element-desktop synced 2025-03-14 16:37:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Added the ability to specify a proxy for electron to connect through in the config.json file.

Browse Source
This commit is contained in:
TheraNinjaCat 2020-03-31 21:25:51 +13:00
parent c2be98e3df
commit e50281f11c
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/electron-main.js
View File

@ -696,7 +696,17 @@ app.on('ready', async () => {
spellcheck: true,
},
});
mainWindow.loadURL('vector://vector/webapp/');
if (vectorConfig['proxy']) {
console.log(`Starting electron through proxy: ${vectorConfig['proxy']}`);
mainWindow.webContents.session.setProxy({proxyRules: vectorConfig['proxy']})
.then(() => {
mainWindow.loadURL('vector://vector/webapp/');
});
} else {
mainWindow.loadURL('vector://vector/webapp/');
}
Menu.setApplicationMenu(vectorMenu);
// Create trayIcon icon