Merge pull request #643 from sachaaaaa/pairing_QR

Show pubkey QR code in primary pairing dialog

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>

js/views/device_pairing_dialog_view.js

@@ -5,6 +5,7 @@
   textsecure,
   ConversationController,
   $,
+  QRCode,
 */
 
 // eslint-disable-next-line func-names
@@ -21,6 +22,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;
@@ -194,6 +199,7 @@
     },
     close() {
       this.remove();
+      this.qr.clear();
       if (this.pubKey && !this.accepted) {
         this.trigger('devicePairingRequestRejected', this.pubKey);
       }