camera working back and forth

1 files changed, 23 insertions, 1 deletions

diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index bcc7075c2..62d707432 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -380,6 +380,9 @@ module.exports = class MetamaskController extends EventEmitter {
       // TREZOR
       unlockTrezorAccount: nodeify(this.unlockTrezorAccount, this),
 
+      // QR code scanner
+      scanQrCode: nodeify(this.scanQrCode, this),
+
       // vault management
       submitPassword: nodeify(this.submitPassword, this),
 
@@ -653,7 +656,26 @@ module.exports = class MetamaskController extends EventEmitter {
 
     const { identities } = this.preferencesController.store.getState()
     return { ...keyState, identities }
-   }
+  }
+
+  scanQrCode () {
+    return new Promise((resolve, reject) => {
+      console.log('QR-SCANNER: intializing QR code scanner feature (MM controller)')
+      // Tell contentscript to inject the QR reader
+      this.platform.sendMessage('qr-code-scanner-init')
+      console.log('QR-SCANNER: message to initialize has been sent (MM controller)')
+      // Wait for the scanner to send something back
+      this.platform.addMessageListener(({ action, data }) => {
+        console.log('QR-SCANNER: message received (MM controller)', action, data)
+        if (action && action === 'qr-code-scanner-data') {
+          const normalizedAddress = data.replace('ethereum:', '')
+          console.log('QR-SCANNER: resolving promise!', normalizedAddress)
+          return Promise.resolve(normalizedAddress)
+        }
+      })
+      console.log('QR-SCANNER: now listening (MM controller)')
+    })
+  }
 
 
   //