From ad7d38c0dc206074379c813b307ed9350c7efeb0 Mon Sep 17 00:00:00 2001
From: Jakub Stasiak <kubafr2@gmail.com>
Date: Wed, 11 Apr 2018 18:32:27 +0200
Subject: [PATCH] Update: allow other extension to connect

---
 app/manifest.json         |  3 ++-
 app/scripts/background.js | 14 ++++++++++----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/app/manifest.json b/app/manifest.json
index dc46f1ca4..950bab2f1 100644
--- a/app/manifest.json
+++ b/app/manifest.json
@@ -67,6 +67,7 @@
   "externally_connectable": {
     "matches": [
       "https://metamask.io/*"
-    ]
+    ],
+    "ids": ["*"]
   }
 }
\ No newline at end of file
diff --git a/app/scripts/background.js b/app/scripts/background.js
index 6550e8944..6296eaa21 100644
--- a/app/scripts/background.js
+++ b/app/scripts/background.js
@@ -197,6 +197,7 @@ function setupController (initState, initLangCode) {
   // connect to other contexts
   //
   extension.runtime.onConnect.addListener(connectRemote)
+  extension.runtime.onConnectExternal.addListener(connectExternal)
 
   const metamaskInternalProcessHash = {
     [ENVIRONMENT_TYPE_POPUP]: true,
@@ -211,9 +212,9 @@ function setupController (initState, initLangCode) {
   function connectRemote (remotePort) {
     const processName = remotePort.name
     const isMetaMaskInternalProcess = metamaskInternalProcessHash[processName]
-    const portStream = new PortStream(remotePort)
 
     if (isMetaMaskInternalProcess) {
+      const portStream = new PortStream(remotePort)
       // communication with popup
       controller.isClientOpen = true
       controller.setupTrustedCommunication(portStream, 'MetaMask')
@@ -246,12 +247,17 @@ function setupController (initState, initLangCode) {
         })
       }
     } else {
-      // communication with page
-      const originDomain = urlUtil.parse(remotePort.sender.url).hostname
-      controller.setupUntrustedCommunication(portStream, originDomain)
+      connectExternal(remotePort)
     }
   }
 
+  // communication with page or other extension
+  function connectExternal(remotePort) {
+    const originDomain = urlUtil.parse(remotePort.sender.url).hostname
+    const portStream = new PortStream(remotePort)
+    controller.setupUntrustedCommunication(portStream, originDomain)
+  }
+
   //
   // User Interface setup
   //