Simplify bitcoin protocol handler check

Auditors: @bbondy, @mrose17

app/index.js

@@ -501,12 +501,6 @@ app.on('ready', () => {
       downloadActions.openDownloadPath(Immutable.fromJS(download))
     })
 
-    ipcMain.on(messages.CHECK_BITCOIN_HANDLER, () => {
-      electron.protocol.isProtocolHandled('bitcoin', (handled) => {
-        appActions.setBitcoinHandled(handled)
-      })
-    })
-
     ipcMain.on(messages.CERT_ERROR_ACCEPTED, (event, url) => {
       try {
         let host = urlParse(url).host

app/ledger.js

@@ -138,6 +138,13 @@ var boot = () => {
  */
 
 if (ipc) {
+  ipc.on(messages.CHECK_BITCOIN_HANDLER, () => {
+    if (typeof protocolHandler.isNavigatorProtocolHandled === 'function') {
+      ledgerInfo.hasBitcoinHandler = protocolHandler.isNavigatorProtocolHandled('', 'bitcoin')
+      appActions.updateLedgerInfo(underscore.omit(ledgerInfo, [ '_internal' ]))
+    }
+  })
+
   ipc.on(messages.LEDGER_PUBLISHER, (event, location) => {
     var ctx
 
@@ -695,6 +702,8 @@ var ledgerInfo = {
   buyURL: undefined,
   bravery: undefined,
 
+  hasBitcoinHandler: false,
+
   _internal: {}
 }
 
@@ -709,10 +718,6 @@ var updateLedgerInfo = () => {
                       underscore.pick(info, [ 'address', 'balance', 'unconfirmed', 'satoshis', 'btc', 'amount', 'currency' ]))
     if ((!info.buyURLExpires) || (info.buyURLExpires > now)) ledgerInfo.buyURL = info.buyURL
     underscore.extend(ledgerInfo, ledgerInfo._internal.cache || {})
-
-    if (typeof protocolHandler.isNavigatorProtocolHandled === 'function') {
-      if (!protocolHandler.isNavigatorProtocolHandled('', 'bitcoin')) delete ledgerInfo.paymentURL
-    }
   }
 
   if (clientOptions.debugP) {

docs/appActions.md

@@ -322,16 +322,6 @@ Clears the data specified in dataDetail
 
 
 
-### setBitcoinHandled() 
-
-Sets whether the bitcoin protocol is handled.
-
-**Parameters**
-
-**setBitcoinHandled**: `boolean`, Sets whether the bitcoin protocol is handled.
-
-
-
 ### addAutofillAddress(detail, originalDetail) 
 
 Add address data

docs/state.md

@@ -401,7 +401,8 @@ WindowStore
         currency: string,
         amount: number
       }
-    }
+    },
+    hasBitcoinHandler: boolean, // Whether Brave has a bitcoin: protocol handler
   },
   publisherInfo: {
     synopsis: {
@@ -420,7 +421,6 @@ WindowStore
       score: ?
     }
   },
-  hasBitcoinHandler: boolean, // Whether Brave has a bitcoin: protocol handler
   autofillAddressDetail: {
     name: string,
     organization: string,

js/about/preferences.js

@@ -304,7 +304,7 @@ class BitcoinDashboard extends ImmutableComponent {
                 </a>
                 <div data-l10n-id='bitcoinAddress' className='labelText' />
                 <span className='fa fa-clipboard settingsListCopy alt' title='Copy to clipboard' onClick={this.copyToClipboard.bind(this, this.ledgerData.get('address'))} />
-                <span>{this.ledgerData.get('address')}</span>
+                <span className='smallText'>{this.ledgerData.get('address')}</span>
               </div>
               : <div>
                 <div data-l10n-id='bitcoinPaymentURL' className='labelText' />

js/actions/appActions.js

@@ -369,17 +369,6 @@ const appActions = {
     })
   },
 
-  /**
-   * Sets whether the bitcoin protocol is handled.
-   * @param {boolean}
-   */
-  setBitcoinHandled: function (handled) {
-    AppDispatcher.dispatch({
-      actionType: AppConstants.APP_SET_BITCOIN_HANDLED,
-      handled
-    })
-  },
-
   /**
    * Add address data
    * @param {object} detail - the address to add as per doc/state.md's autofillAddressDetail

js/components/frame.js

@@ -79,7 +79,6 @@ class Frame extends ImmutableComponent {
     if (location === 'about:preferences') {
       ipc.send(messages.CHECK_BITCOIN_HANDLER)
       const ledgerData = this.props.ledgerInfo.merge(this.props.publisherInfo).toJS()
-      ledgerData.hasBitcoinHandler = this.props.hasBitcoinHandler
       this.webview.send(messages.LEDGER_UPDATED, ledgerData)
       this.webview.send(messages.SETTINGS_UPDATED, this.props.settings ? this.props.settings.toJS() : null)
       this.webview.send(messages.SITE_SETTINGS_UPDATED, this.props.allSiteSettings ? this.props.allSiteSettings.toJS() : null)

js/components/main.js

@@ -961,7 +961,6 @@ class Main extends ImmutableComponent {
               flash={this.props.appState.get('flash')}
               cookieblock={this.props.appState.get('cookieblock')}
               flashInitialized={this.props.appState.get('flashInitialized')}
-              hasBitcoinHandler={this.props.appState.get('hasBitcoinHandler')}
               allSiteSettings={allSiteSettings}
               ledgerInfo={this.props.appState.get('ledgerInfo') || new Immutable.Map()}
               publisherInfo={this.props.appState.get('publisherInfo') || new Immutable.Map()}

js/constants/appConstants.js

@@ -35,7 +35,6 @@ const AppConstants = {
   APP_CLEAR_MESSAGE_BOXES: _, /** @param {string} origin */
   APP_ADD_WORD: _, /** @param {string} word, @param {boolean} learn */
   APP_SET_DICTIONARY: _, /** @param {string} locale */
-  APP_SET_BITCOIN_HANDLED: _, /** @param {boolean} handled */
   APP_ADD_AUTOFILL_ADDRESS: _,
   APP_REMOVE_AUTOFILL_ADDRESS: _,
   APP_ADD_AUTOFILL_CREDIT_CARD: _,

js/stores/appStore.js

@@ -542,9 +542,6 @@ const handleAppAction = (action) => {
         Filtering.clearStorageData()
       }
       break
-    case AppConstants.APP_SET_BITCOIN_HANDLED:
-      appState = appState.set('hasBitcoinHandler', action.handled)
-      break
     case AppConstants.APP_ADD_AUTOFILL_ADDRESS:
       {
         const Filtering = require('../../app/filtering')

less/about/preferences.less

@@ -578,6 +578,9 @@ table.sortableTable {
       }
       font-size: 0.9em;
     }
+    .smallText {
+      font-size: 0.9em;
+    }
     .settingsListTitle {
       font-weight: 600;
       font-size: 1em;