Matrix/element-desktop
Matrix/element-desktop
1
0
Fork 0
mirror of https://github.com/vector-im/element-desktop.git synced 2024-08-08 22:43:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

electron-main: Fix some lint issues.

Browse source
This commit is contained in:
Damir Jelić 2020-10-13 17:07:39 +02:00
parent 1d811b6f4b
commit 8add8d7717
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/electron-main.js
View file

@ -505,17 +505,17 @@ ipcMain.on('seshat', async function(ev, payload) {
break; break;
case 'initEventIndex': case 'initEventIndex':
const userId = args[0];
const deviceId = args[1];
if (eventIndex === null) { if (eventIndex === null) {
const userId = args[0];
const deviceId = args[1];
const passphraseKey = `seshat|${userId}|${deviceId}`;
let changePassphrase = false; let changePassphrase = false;
let passphrase = seshatDefaultPassphrase; let passphrase = seshatDefaultPassphrase;
if (keytar) { if (keytar) {
try { try {
// Try to get a passphrase for seshat. // Try to get a passphrase for seshat.
const passphraseKey = `seshat|${userId}|${deviceId}`;
const storedPassphrase = await keytar.getPassword("element.io", passphraseKey); const storedPassphrase = await keytar.getPassword("element.io", passphraseKey);
// If no passphrase was found mark that we should change // If no passphrase was found mark that we should change
@ -564,11 +564,11 @@ ipcMain.on('seshat', async function(ev, payload) {
throw (e); throw (e);
} }
} }
} };
try { try {
eventIndex = await openSeshat(); eventIndex = await openSeshat();
} catch(e) { } catch (e) {
sendError(payload.id, e); sendError(payload.id, e);
return; return;
} }
@ -585,7 +585,7 @@ ipcMain.on('seshat', async function(ev, payload) {
// Re-open the event index with the new passphrase. // Re-open the event index with the new passphrase.
eventIndex = new Seshat(eventStorePath, {newPassphrase}); eventIndex = new Seshat(eventStorePath, {newPassphrase});
} catch(e) { } catch (e) {
sendError(payload.id, e); sendError(payload.id, e);
return; return;
} }