From 2188c2242532c23ffe9c14e092a15d9ee1b9106e Mon Sep 17 00:00:00 2001
From: Samuel Elliott <samuel@fancy.org.uk>
Date: Wed, 22 Aug 2018 13:35:23 +0100
Subject: [PATCH] Update begin key exchange icon

---
 client/src/builtin/E2EEComponent.vue          | 12 ++++----
 .../src/ui/components/common/MaterialIcon.js  |  1 +
 .../common/materialicons/IcVpnKey.vue         | 29 +++++++++++++++++++
 3 files changed, 36 insertions(+), 6 deletions(-)
 create mode 100644 client/src/ui/components/common/materialicons/IcVpnKey.vue

diff --git a/client/src/builtin/E2EEComponent.vue b/client/src/builtin/E2EEComponent.vue
index 222769af..ca9026c9 100644
--- a/client/src/builtin/E2EEComponent.vue
+++ b/client/src/builtin/E2EEComponent.vue
@@ -25,30 +25,30 @@
             <div v-else class="bd-e2eeTaBtn bd-e2eeLock bd-ok">
                 <MiLock v-tooltip="'Ready!'" />
             </div>
+
             <template slot="popover">
                 <div @click="toggleEncrypt" :class="{'bd-warn': !E2EE.encryptNewMessages, 'bd-ok': E2EE.encryptNewMessages}"><MiLock size="16" v-tooltip="'Toggle Encryption'" /></div>
                 <div v-close-popover @click="showUploadDialog" v-if="!error"><MiImagePlus size="16" v-tooltip="'Upload Encrypted Image'" /></div>
-                <!-- Using these icons for now -->
-                <div v-close-popover @click="generatePublicKey" v-if="DiscordApi.currentChannel.type === 'DM'"><MiPencil size="16" v-tooltip="'Begin Key Exchange'" /></div>
+                <div v-close-popover @click="generatePublicKey" v-if="DiscordApi.currentChannel.type === 'DM'"><MiIcVpnKey size="16" v-tooltip="'Begin Key Exchange'" /></div>
             </template>
         </v-popover>
         <div class="bd-taDivider"></div>
     </div>
 </template>
 
-
-
 <script>
     import fs from 'fs';
     import { Utils } from 'common';
     import { remote } from 'electron';
     import { E2EE } from 'builtin';
     import { DiscordApi, Security, WebpackModules } from 'modules';
-    import { MiLock, MiPlus, MiImagePlus, MiPencil, MiRefresh } from '../ui/components/common/MaterialIcon';
     import { Toasts } from 'ui';
+    import { MiLock, MiImagePlus, MiIcVpnKey } from '../ui/components/common/MaterialIcon';
 
     export default {
-        components: { MiLock, MiPlus, MiImagePlus, MiPencil, MiRefresh },
+        components: {
+            MiLock, MiImagePlus, MiIcVpnKey
+        },
         data() {
             return {
                 E2EE,
diff --git a/client/src/ui/components/common/MaterialIcon.js b/client/src/ui/components/common/MaterialIcon.js
index 18355005..182b9826 100644
--- a/client/src/ui/components/common/MaterialIcon.js
+++ b/client/src/ui/components/common/MaterialIcon.js
@@ -20,4 +20,5 @@ export { default as MiSuccess } from './materialicons/Success.vue';
 export { default as AccountCircle } from './materialicons/AccountCircle.vue';
 export { default as MiLock } from './materialicons/Lock.vue';
 export { default as MiImagePlus } from './materialicons/ImagePlus.vue';
+export { default as MiIcVpnKey } from './materialicons/IcVpnKey.vue';
 export { default as MiArrowLeft } from './materialicons/ArrowLeft.vue';
diff --git a/client/src/ui/components/common/materialicons/IcVpnKey.vue b/client/src/ui/components/common/materialicons/IcVpnKey.vue
new file mode 100644
index 00000000..4e75fd95
--- /dev/null
+++ b/client/src/ui/components/common/materialicons/IcVpnKey.vue
@@ -0,0 +1,29 @@
+/**
+ * BetterDiscord Material Design Icon
+ * Copyright (c) 2015-present Jiiks/JsSucks - https://github.com/Jiiks / https://github.com/JsSucks
+ * All rights reserved.
+ * https://betterdiscord.net
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * Material Design Icons
+ * Copyright (c) 2014 Google
+ * Apache 2.0 LICENSE
+ * https://www.apache.org/licenses/LICENSE-2.0.txt
+*/
+
+<template>
+    <span class="bd-materialDesignIcon">
+        <svg :width="size || 24" :height="size || 24" viewBox="0 0 24 24">
+            <path d="M0 0h24v24H0z" fill="none"/>
+            <path d="M12.65 10C11.83 7.67 9.61 6 7 6c-3.31 0-6 2.69-6 6s2.69 6 6 6c2.61 0 4.83-1.67 5.65-4H17v4h4v-4h2v-4H12.65zM7 14c-1.1 0-2-.9-2-2s.9-2 2-2 2 .9 2 2-.9 2-2 2z"/>
+        </svg>
+    </span>
+</template>
+
+<script>
+    export default {
+        props: ['size']
+    }
+</script>