From 0aa370aeb9b4b6b737351519bc042149668fb897 Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Tue, 14 Aug 2018 12:57:39 +0300
Subject: [PATCH] add custom text for confirm modal buttons

---
 client/src/builtin/E2EE.js                          | 6 ++++--
 client/src/ui/components/bd/modals/ConfirmModal.vue | 4 ++--
 client/src/ui/modals.js                             | 8 ++++----
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/client/src/builtin/E2EE.js b/client/src/builtin/E2EE.js
index d1d671ad..8c57c8dd 100644
--- a/client/src/builtin/E2EE.js
+++ b/client/src/builtin/E2EE.js
@@ -100,6 +100,8 @@ export default new class E2EE extends BuiltinModule {
             if (ECDH_STORAGE.hasOwnProperty(dmChannelID)) {
                 delete ECDH_STORAGE[dmChannelID];
                 Toasts.error('Key exchange expired!');
+                if (this.preExchangeState) this.encryptNewMessages = this.preExchangeState;
+                this.preExchangeState = null;
             }
         }, 30000);
         return Security.generateECDHKeys(ECDH_STORAGE[dmChannelID]);
@@ -131,9 +133,9 @@ export default new class E2EE extends BuiltinModule {
         const splitContent = component.props.message.content.split('\n');
         if (splitContent.length < 5) return;
         const [tagstart, begin, key, end, tagend] = splitContent;
-        console.log(component);
+
         try {
-            await Modals.confirm('Key Exhcange', 'Public key received. Accept?').promise;
+            await Modals.confirm('Key Exhchange', 'Public key received. Accept?', 'Accept', 'Reject').promise;
             // We already sent our key
             if (!ECDH_STORAGE.hasOwnProperty(channelId)) {
                 const publicKeyMessage = `\`\`\`\n-----BEGIN PUBLIC KEY-----\n${this.createKeyExchange(channelId)}\n-----END PUBLIC KEY-----\n\`\`\``;
diff --git a/client/src/ui/components/bd/modals/ConfirmModal.vue b/client/src/ui/components/bd/modals/ConfirmModal.vue
index 080ab293..d19cc80a 100644
--- a/client/src/ui/components/bd/modals/ConfirmModal.vue
+++ b/client/src/ui/components/bd/modals/ConfirmModal.vue
@@ -13,8 +13,8 @@
         <div slot="body" class="bd-modal-basic-body">{{ modal.text }}</div>
         <div slot="footer" class="bd-modal-controls">
             <div class="bd-flex-grow"></div>
-            <div class="bd-button" @click="modal.close">Cancel</div>
-            <div class="bd-button bd-ok" @click="() => { modal.confirm(); modal.close(); }">OK</div>
+            <div class="bd-button" @click="modal.close">{{ modal.cancelText || 'Cancel' }}</div>
+            <div class="bd-button bd-ok" @click="() => { modal.confirm(); modal.close(); }">{{ modal.confirmText || 'OK' }}</div>
         </div>
     </Modal>
 </template>
diff --git a/client/src/ui/modals.js b/client/src/ui/modals.js
index f8e927e9..b9f572ae 100644
--- a/client/src/ui/modals.js
+++ b/client/src/ui/modals.js
@@ -163,12 +163,12 @@ export default class Modals {
      * @param {String} text A string that will be displayed in the modal body
      * @return {Modal}
      */
-    static confirm(title, text) {
-        return this.add(this.createConfirmModal(title, text));
+    static confirm(title, text, confirmText, cancelText) {
+        return this.add(this.createConfirmModal(title, text, confirmText, cancelText));
     }
 
-    static createConfirmModal(title, text) {
-        const modal = { title, text };
+    static createConfirmModal(title, text, confirmText, cancelText) {
+        const modal = { title, text, confirmText, cancelText };
         modal.promise = new Promise((resolve, reject) => {
             modal.confirm = () => resolve(true);
             modal.beforeClose = () => reject();