fix for requested changes

MetaMask · Jan 18, 2018 · 7c81bf7 · 7c81bf7
1 parent 5dc02d9
commit 7c81bf7
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/app/scripts/controllers/network.js b/app/scripts/controllers/network.js
@@ -11,6 +11,7 @@ const createEventEmitterProxy = require('../lib/events-proxy.js')
 const RPC_ADDRESS_LIST = require('../config.js').network
 const DEFAULT_RPC = RPC_ADDRESS_LIST['rinkeby']
 const INFURA_PROVIDER_TYPES = ['ropsten', 'rinkeby', 'kovan', 'mainnet']
+const noop = function () {}
 
 module.exports = class NetworkController extends EventEmitter {
 
@@ -58,7 +59,7 @@ module.exports = class NetworkController extends EventEmitter {
     return this.getNetworkState() === 'loading'
   }
 
-  lookupNetwork (cb = () => {}) {
+  lookupNetwork (cb = noop){
     // Prevent firing when provider is not defined.
     if (!this.ethQuery || !this.ethQuery.sendAsync) {
       return log.warn('NetworkController - lookupNetwork aborted due to missing ethQuery')
@@ -67,11 +68,12 @@ module.exports = class NetworkController extends EventEmitter {
       if (err) {
         this.setNetworkState('loading')
         console.error(err)
+        cb(err)
         return
       }
       log.info('web3.getNetwork returned ' + network)
       this.setNetworkState(network)
-      cb(err, network)
+      cb(null, network)
     })
   }
 

diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
@@ -62,17 +62,17 @@ module.exports = class MetamaskController extends EventEmitter {
     this.networkController = new NetworkController(initState.NetworkController)
 
     // setup onLine lister for restarting the provider
-    if (this.platform.onLine) {
-      this.platform.onLine(() => {
+    if (this.platform.addOnLineListener) {
+      this.platform.addOnLineListener(() => {
         // guard against premature firring of the event listener
         if (this.provider) {
-          // start the provider up
+          // start the block tracker up
           this.provider.stop()
           this.provider.start()
         }
         // look up the network
         this.networkController.lookupNetwork(() => {
-          this.emit('update', this.getState())
+          this.sendUpdate()
         })
       })
     }

diff --git a/app/scripts/platforms/extension.js b/app/scripts/platforms/extension.js
@@ -31,7 +31,7 @@ class ExtensionPlatform {
     return navigator.onLine
   }
 
-  onLine (cb) {
+  addOnLineListener (cb) {
     window.addEventListener('online', cb)
   }
 }