removes update to preview from preferences

Fix #11638
brave · Oct 23, 2017 · e7b6947 · e7b6947
1 parent 5484ba6
commit e7b6947
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 20,561 deletions.
diff --git a/app/index.js b/app/index.js
@@ -309,13 +309,12 @@ app.on('ready', () => {
     })
     // DO NOT TO THIS LIST - see above
 
-    // We need the initial state to read the UPDATE_TO_PREVIEW_RELEASES preference
     loadAppStatePromise.then((initialImmutableState) => {
       updater.init(
         process.platform,
         process.arch,
         process.env.BRAVE_UPDATE_VERSION || app.getVersion(),
-        initialImmutableState.getIn(['settings', settings.UPDATE_TO_PREVIEW_RELEASES])
+        process.env.BRAVE_ENABLE_PREVIEW_UPDATES !== undefined
       )
 
       // This is fired by a menu entry

diff --git a/app/renderer/components/preferences/advancedTab.js b/app/renderer/components/preferences/advancedTab.js
@@ -21,27 +21,13 @@ const {scaleSize} = require('../../../common/constants/toolbarUserInterfaceScale
 
 // Utils
 const {changeSetting} = require('../../lib/settingsUtil')
-const platformUtil = require('../../../common/lib/platformUtil')
-const isLinux = platformUtil.isLinux()
 
 class AdvancedTab extends ImmutableComponent {
-  previewReleases () {
-    return isLinux
-      ? null
-      : <SettingCheckbox
-        dataL10nId='updateToPreviewReleases'
-        data-test-id='update-to-preview-releases'
-        prefKey={settings.UPDATE_TO_PREVIEW_RELEASES}
-        settings={this.props.settings}
-        onChangeSetting={this.props.onChangeSetting} />
-  }
-
   render () {
     return <section>
       <main className={css(styles.advancedTabMain)}>
         <DefaultSectionTitle data-l10n-id='contentSettings' />
         <SettingsList>
-          {this.previewReleases()}
           <SettingCheckbox dataL10nId='useHardwareAcceleration' prefKey={settings.HARDWARE_ACCELERATION_ENABLED} settings={this.props.settings} onChangeSetting={this.props.onChangeSetting} />
           <SettingCheckbox dataL10nId='useSmoothScroll' prefKey={settings.SMOOTH_SCROLL_ENABLED} settings={this.props.settings} onChangeSetting={this.props.onChangeSetting} />
           <SettingCheckbox dataL10nId='sendCrashReports' prefKey={settings.SEND_CRASH_REPORTS} settings={this.props.settings} onChangeSetting={this.props.onChangeSetting} />

diff --git a/js/about/preferences.js b/js/about/preferences.js
@@ -838,8 +838,7 @@ class AboutPreferences extends React.Component {
       settings.PDFJS_ENABLED,
       settings.TORRENT_VIEWER_ENABLED,
       settings.SMOOTH_SCROLL_ENABLED,
-      settings.SEND_CRASH_REPORTS,
-      settings.UPDATE_TO_PREVIEW_RELEASES
+      settings.SEND_CRASH_REPORTS
     ]
     if (settingsRequiringRestart.includes(key)) {
       ipc.send(messages.PREFS_RESTART, key, value)

diff --git a/js/constants/appConfig.js b/js/constants/appConfig.js
@@ -193,7 +193,6 @@ module.exports = {
     'advanced.smooth-scroll-enabled': false,
     'advanced.send-crash-reports': true,
     'advanced.send-usage-statistics': false,
-    'advanced.update-to-preview-releases': false,
     'advanced.toolbar-ui-scale': 'normal',
     'shutdown.clear-history': false,
     'shutdown.clear-downloads': false,

diff --git a/js/constants/settings.js b/js/constants/settings.js
@@ -75,7 +75,6 @@ const settings = {
   SMOOTH_SCROLL_ENABLED: 'advanced.smooth-scroll-enabled',
   SEND_CRASH_REPORTS: 'advanced.send-crash-reports',
   SEND_USAGE_STATISTICS: 'advanced.send-usage-statistics',
-  UPDATE_TO_PREVIEW_RELEASES: 'advanced.update-to-preview-releases',
   ADBLOCK_CUSTOM_RULES: 'adblock.customRules',
   TOOLBAR_UI_SCALE: 'advanced.toolbar-ui-scale',
   // Sync settings