From 94dd331cb1984cdf3426a676daf61917001efb55 Mon Sep 17 00:00:00 2001
From: sachaaaaa <sacha@loki.network>
Date: Fri, 22 Nov 2019 10:40:13 +1100
Subject: [PATCH] Show pubkey QR code in pairing dialog (as primary)

---
 background.html                        | 3 +++
 js/views/device_pairing_dialog_view.js | 8 +++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/background.html b/background.html
index 8757b64be..ad0d116ac 100644
--- a/background.html
+++ b/background.html
@@ -263,6 +263,9 @@
       <!-- Waiting for request -->
       <div class="waitingForRequestView" style="display: none;">
         <h4>{{ waitingForRequestTitle }}</h4>
+        <div class="qr-dialog">
+          <div id="qr"></div>
+        </div>
         <div class='buttons'>
           <button class="cancel">{{ cancelText }}</button>
         </div>
diff --git a/js/views/device_pairing_dialog_view.js b/js/views/device_pairing_dialog_view.js
index e9a3294d0..8724e1c6c 100644
--- a/js/views/device_pairing_dialog_view.js
+++ b/js/views/device_pairing_dialog_view.js
@@ -5,7 +5,8 @@
   textsecure,
   ConversationController,
   $,
-  lokiFileServerAPI
+  lokiFileServerAPI,
+  QRCode,
 */
 
 // eslint-disable-next-line func-names
@@ -22,6 +23,10 @@
       this.reset();
       this.render();
       this.showView();
+      this.qr = new QRCode(this.$('#qr')[0], {
+        correctLevel: QRCode.CorrectLevel.L,
+      });
+      this.qr.makeCode(textsecure.storage.user.getNumber());
     },
     reset() {
       this.pubKey = null;
@@ -198,6 +203,7 @@
     },
     close() {
       this.remove();
+      this.qr.clear();
       if (this.pubKey && !this.accepted) {
         this.trigger('devicePairingRequestRejected', this.pubKey);
       }