lightcordwarez
/
BetterDiscordApp-v2
mirror of https://github.com/JsSucks/BetterDiscordApp
1
0
Fork 0
Code Issues 3 Releases Wiki Activity

Reset encryptNewMessages to previous state

This commit is contained in:
Jiiks 2018-08-14 11:08:41 +03:00
parent 8b4318c06e
commit 73f2fe4fd0
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
client/src/builtin/E2EE.js
View File

@ -31,7 +31,6 @@ export default new class E2EE extends BuiltinModule {
constructor() {
super();
window.nodecrypto = nodecrypto;
this.encryptNewMessages = true;
this.ecdhDate = START_DATE;
}
@ -147,6 +146,8 @@ export default new class E2EE extends BuiltinModule {
const secret = this.computeSecret(channelId, key);
this.setKey(channelId, secret);
Toasts.success('Key exchange complete!');
if (this.preEchangeState) this.encryptNewMessages = this.preEchangeState;
this.preEchangeState = null;
} catch (err) {
return;
}

1
client/src/builtin/E2EEComponent.vue
View File

@ -92,6 +92,7 @@
Toasts.warning('Key exchange for channel already in progress!');
return;
}
E2EE.preEchangeState = E2EE.encryptNewMessages;
E2EE.encryptNewMessages = false; // Disable encrypting new messages so we won't encrypt public keys
const publicKeyMessage = `\`\`\`\n-----BEGIN PUBLIC KEY-----\n${keyExchange}\n-----END PUBLIC KEY-----\n\`\`\``;
WebpackModules.getModuleByName('DraftActions').saveDraft(DiscordApi.currentChannel.id, publicKeyMessage);