Fix multiple channels desktop name

also fix #1336 requires brave/muon#309 Auditors: @bsclifton, @bbondy Test Plan:
brave · Sep 14, 2017 · 5ec53ab · 5ec53ab
1 parent 105b667
commit 5ec53ab
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 6 deletions.
diff --git a/app/channel.js b/app/channel.js
@@ -31,3 +31,24 @@ exports.formattedChannel = () => {
   }
   return Object.keys(channelMapping).includes(channel) ? channelMapping[channel] : channel
 }
+
+exports.getLinuxDesktopName = () => {
+  let desktopName
+  switch (channel) {
+    case 'dev':
+      desktopName = 'brave.desktop'
+      break
+    case 'beta':
+      desktopName = 'brave-beta.desktop'
+      break
+    case 'developer':
+      desktopName = 'brave-developer.desktop'
+      break
+    case 'nightly':
+      desktopName = 'brave-nightly.desktop'
+      break
+    default:
+      desktopName = 'brave.desktop'
+  }
+  return desktopName
+}
diff --git a/app/index.js b/app/index.js
@@ -202,8 +202,17 @@ app.on('ready', () => {
       }
     } else {
       // Default browser checking
-      let isDefaultBrowser = ['development', 'test'].includes(process.env.NODE_ENV)
-        ? true : defaultProtocols.every(p => app.isDefaultProtocolClient(p))
+      let isDefaultBrowser
+      if (['development', 'test'].includes(process.env.NODE_ENV)) {
+        isDefaultBrowser = true
+      } else if (process.platform === 'linux') {
+        const Channel = require('./channel')
+        const desktopName = Channel.getLinuxDesktopName()
+        isDefaultBrowser = defaultProtocols.every(p => app.isDefaultProtocolClient(p, desktopName)) &&
+          app.isDefaultProtocolClient('', desktopName)
+      } else {
+        isDefaultBrowser = defaultProtocols.every(p => app.isDefaultProtocolClient(p))
+      }
       appActions.changeSetting(settings.IS_DEFAULT_BROWSER, isDefaultBrowser)
     }
 

diff --git a/js/stores/appStore.js b/js/stores/appStore.js
@@ -33,6 +33,7 @@ const assert = require('assert')
 const profiles = require('../../app/browser/profiles')
 const {zoomLevel} = require('../../app/common/constants/toolbarUserInterfaceScale')
 const {HrtimeLogger} = require('../../app/common/lib/logUtil')
+const platformUtil = require('../../app/common/lib/platformUtil')
 
 // state helpers
 const {makeImmutable} = require('../../app/common/state/immutableUtil')
@@ -552,12 +553,24 @@ const handleAppAction = (action) => {
     }
     case appConstants.APP_DEFAULT_BROWSER_UPDATED:
       if (action.useBrave) {
-        for (const p of defaultProtocols) {
-          app.setAsDefaultProtocolClient(p)
+        let isDefaultBrowser
+        if (platformUtil.isLinux()) {
+          const Channel = require('../../app/channel')
+          const desktopName = Channel.getLinuxDesktopName()
+          for (const p of defaultProtocols) {
+            app.setAsDefaultProtocolClient(p, desktopName)
+            app.setAsDefaultProtocolClient('', desktopName)
+          }
+          isDefaultBrowser = defaultProtocols.every(p => app.isDefaultProtocolClient(p, desktopName)) &&
+            app.isDefaultProtocolClient('', desktopName)
+        } else {
+          for (const p of defaultProtocols) {
+            app.setAsDefaultProtocolClient(p)
+          }
+          isDefaultBrowser = defaultProtocols.every(p => app.isDefaultProtocolClient(p))
         }
+        appState = appState.setIn(['settings', settings.IS_DEFAULT_BROWSER], isDefaultBrowser)
       }
-      let isDefaultBrowser = defaultProtocols.every(p => app.isDefaultProtocolClient(p))
-      appState = appState.setIn(['settings', settings.IS_DEFAULT_BROWSER], isDefaultBrowser)
       break
     case appConstants.APP_DEFAULT_BROWSER_CHECK_COMPLETE:
       appState = appState.set('defaultBrowserCheckComplete', {})