Merge branch 'master' into master

browser/main/SideNav/index.js

@@ -57,7 +57,7 @@ class SideNav extends React.Component {
 
   deleteTag (tag) {
     const selectedButton = remote.dialog.showMessageBox(remote.getCurrentWindow(), {
-      ype: 'warning',
+      type: 'warning',
       message: i18n.__('Confirm tag deletion'),
       detail: i18n.__('This will permanently remove this tag.'),
       buttons: [i18n.__('Confirm'), i18n.__('Cancel')]

browser/main/lib/ConfigManager.js

@@ -8,6 +8,7 @@ const win = global.process.platform === 'win32'
 const electron = require('electron')
 const { ipcRenderer } = electron
 const consts = require('browser/lib/consts')
+const electronConfig = new (require('electron-config'))()
 
 let isInitialized = false
 
@@ -26,6 +27,7 @@ export const DEFAULT_CONFIG = {
   sortTagsBy: 'ALPHABETICAL', // 'ALPHABETICAL', 'COUNTER'
   listStyle: 'DEFAULT', // 'DEFAULT', 'SMALL'
   amaEnabled: true,
+  autoUpdateEnabled: true,
   hotkey: {
     toggleMain: OSX ? 'Command + Alt + L' : 'Super + Alt + E',
     toggleMode: OSX ? 'Command + Alt + M' : 'Ctrl + M',
@@ -142,6 +144,8 @@ function get () {
     _save(config)
   }
 
+  config.autoUpdateEnabled = electronConfig.get('autoUpdateEnabled', config.autoUpdateEnabled)
+
   if (!isInitialized) {
     isInitialized = true
     let editorTheme = document.getElementById('editorTheme')
@@ -206,6 +210,8 @@ function set (updates) {
     editorTheme.setAttribute('href', newTheme.path)
   }
 
+  electronConfig.set('autoUpdateEnabled', newConfig.autoUpdateEnabled)
+
   ipcRenderer.send('config-renew', {
     config: get()
   })

browser/main/lib/dataApi/createNoteFromUrl.js

@@ -14,12 +14,18 @@ function validateUrl (str) {
   }
 }
 
+const ERROR_MESSAGES = {
+  ENOTFOUND: 'URL not found. Please check the URL, or your internet connection and try again.',
+  VALIDATION_ERROR: 'Please check if the URL follows this format: https://www.google.com',
+  UNEXPECTED: 'Unexpected error! Please check console for details!'
+}
+
 function createNoteFromUrl (url, storage, folder, dispatch = null, location = null) {
   return new Promise((resolve, reject) => {
     const td = createTurndownService()
 
     if (!validateUrl(url)) {
-      reject({result: false, error: 'Please check your URL is in correct format. (Example, https://www.google.com)'})
+      reject({result: false, error: ERROR_MESSAGES.VALIDATION_ERROR})
     }
 
     const request = url.startsWith('https') ? https : http
@@ -70,8 +76,9 @@ function createNoteFromUrl (url, storage, folder, dispatch = null, location = nu
 
     req.on('error', (e) => {
       console.error('error in parsing URL', e)
-      reject({result: false, error: e})
+      reject({result: false, error: ERROR_MESSAGES[e.code] || ERROR_MESSAGES.UNEXPECTED})
     })
+
     req.end()
   })
 }

browser/main/modals/PreferencesModal/InfoTab.js

@@ -61,6 +61,15 @@ class InfoTab extends React.Component {
     })
   }
 
+  toggleAutoUpdate () {
+    const newConfig = {
+      autoUpdateEnabled: !this.state.config.autoUpdateEnabled
+    }
+
+    this.setState({ config: newConfig })
+    ConfigManager.set(newConfig)
+  }
+
   infoMessage () {
     const { amaMessage } = this.state
     return amaMessage ? <p styleName='policy-confirm'>{amaMessage}</p> : null
@@ -140,6 +149,8 @@ class InfoTab extends React.Component {
           </li>
         </ul>
 
+        <div><label><input type='checkbox' onChange={this.toggleAutoUpdate.bind(this)} checked={this.state.config.autoUpdateEnabled} />{i18n.__('Enable Auto Update')}</label></div>
+
         <hr styleName='separate-line' />
 
         <div styleName='group-header2--sub'>{i18n.__('Analytics')}</div>