Update to v0.8.17

1 files changed, 55 insertions, 34 deletions

diff --git a/remove-analytics.patch b/remove-analytics.patch
index 18effed9f5b2..599140de87ba 100644
--- a/remove-analytics.patch
+++ b/remove-analytics.patch
@@ -1,6 +1,6 @@
 diff -ura a/browser/finder/index.js b/browser/finder/index.js
---- a/browser/finder/index.js	2017-10-28 07:15:41.000000000 +0200
-+++ b/browser/finder/index.js	2017-10-28 16:43:06.758192934 +0200
+--- a/browser/finder/index.js	2017-11-25 06:41:20.000000000 +0100
++++ b/browser/finder/index.js	2017-11-25 08:47:43.067324811 +0100
 @@ -10,7 +10,6 @@
  import NoteList from './NoteList'
  import NoteDetail from './NoteDetail'
@@ -18,17 +18,17 @@ diff -ura a/browser/finder/index.js b/browser/finder/index.js
        e.preventDefault()
      }
 diff -ura a/browser/main/Detail/MarkdownNoteDetail.js b/browser/main/Detail/MarkdownNoteDetail.js
---- a/browser/main/Detail/MarkdownNoteDetail.js	2017-10-28 07:15:41.000000000 +0200
-+++ b/browser/main/Detail/MarkdownNoteDetail.js	2017-10-28 16:43:05.358168557 +0200
+--- a/browser/main/Detail/MarkdownNoteDetail.js	2017-11-25 06:41:20.000000000 +0100
++++ b/browser/main/Detail/MarkdownNoteDetail.js	2017-11-25 08:48:07.247452962 +0100
 @@ -13,7 +13,6 @@
  import StatusBar from '../StatusBar'
  import _ from 'lodash'
  import { findNoteTitle } from 'browser/lib/findNoteTitle'
 -import AwsMobileAnalyticsConfig from 'browser/main/lib/AwsMobileAnalyticsConfig'
  import TrashButton from './TrashButton'
+ import PermanentDeleteButton from './PermanentDeleteButton'
  import InfoButton from './InfoButton'
- import InfoPanel from './InfoPanel'
-@@ -106,7 +105,6 @@
+@@ -107,7 +106,6 @@
            type: 'UPDATE_NOTE',
            note: note
          })
@@ -36,7 +36,7 @@ diff -ura a/browser/main/Detail/MarkdownNoteDetail.js b/browser/main/Detail/Mark
        })
    }
  
-@@ -145,7 +143,6 @@
+@@ -146,7 +144,6 @@
  
    handleStarButtonClick (e) {
      let { note } = this.state
@@ -45,17 +45,17 @@ diff -ura a/browser/main/Detail/MarkdownNoteDetail.js b/browser/main/Detail/Mark
      note.isStarred = !note.isStarred
  
 diff -ura a/browser/main/Detail/SnippetNoteDetail.js b/browser/main/Detail/SnippetNoteDetail.js
---- a/browser/main/Detail/SnippetNoteDetail.js	2017-10-28 07:15:41.000000000 +0200
-+++ b/browser/main/Detail/SnippetNoteDetail.js	2017-10-28 16:43:04.108146800 +0200
+--- a/browser/main/Detail/SnippetNoteDetail.js	2017-11-25 06:41:20.000000000 +0100
++++ b/browser/main/Detail/SnippetNoteDetail.js	2017-11-25 08:49:05.157759882 +0100
 @@ -16,7 +16,6 @@
  import ConfigManager from 'browser/main/lib/ConfigManager'
  import _ from 'lodash'
  import { findNoteTitle } from 'browser/lib/findNoteTitle'
 -import AwsMobileAnalyticsConfig from 'browser/main/lib/AwsMobileAnalyticsConfig'
  import TrashButton from './TrashButton'
+ import PermanentDeleteButton from './PermanentDeleteButton'
  import InfoButton from './InfoButton'
- import InfoPanel from './InfoPanel'
-@@ -116,7 +115,6 @@
+@@ -117,7 +116,6 @@
            type: 'UPDATE_NOTE',
            note: note
          })
@@ -63,7 +63,7 @@ diff -ura a/browser/main/Detail/SnippetNoteDetail.js b/browser/main/Detail/Snipp
        })
    }
  
-@@ -155,7 +153,6 @@
+@@ -156,7 +154,6 @@
  
    handleStarButtonClick (e) {
      let { note } = this.state
@@ -71,7 +71,7 @@ diff -ura a/browser/main/Detail/SnippetNoteDetail.js b/browser/main/Detail/Snipp
  
      note.isStarred = !note.isStarred
  
-@@ -272,9 +269,6 @@
+@@ -273,9 +270,6 @@
      const mode = syntax != null ? syntax.name : null
      if (mode != null) {
        snippets[index].mode = mode
@@ -81,7 +81,7 @@ diff -ura a/browser/main/Detail/SnippetNoteDetail.js b/browser/main/Detail/Snipp
      }
      this.setState({note: Object.assign(this.state.note, {snippets: snippets})})
  
-@@ -296,10 +290,6 @@
+@@ -297,10 +291,6 @@
        }, () => {
          this.save()
        })
@@ -93,8 +93,8 @@ diff -ura a/browser/main/Detail/SnippetNoteDetail.js b/browser/main/Detail/Snipp
    }
  
 diff -ura a/browser/main/Detail/TagSelect.js b/browser/main/Detail/TagSelect.js
---- a/browser/main/Detail/TagSelect.js	2017-10-28 07:15:41.000000000 +0200
-+++ b/browser/main/Detail/TagSelect.js	2017-10-28 16:43:02.798124006 +0200
+--- a/browser/main/Detail/TagSelect.js	2017-11-25 06:41:20.000000000 +0100
++++ b/browser/main/Detail/TagSelect.js	2017-11-25 08:49:20.347840387 +0100
 @@ -2,7 +2,6 @@
  import CSSModules from 'browser/lib/CSSModules'
  import styles from './TagSelect.styl'
@@ -112,17 +112,17 @@ diff -ura a/browser/main/Detail/TagSelect.js b/browser/main/Detail/TagSelect.js
      let newTag = this.refs.newTag.value.trim().replace(/ +/g, '_')
  
 diff -ura a/browser/main/Main.js b/browser/main/Main.js
---- a/browser/main/Main.js	2017-10-28 07:15:41.000000000 +0200
-+++ b/browser/main/Main.js	2017-10-28 16:43:01.708105043 +0200
-@@ -12,7 +12,6 @@
+--- a/browser/main/Main.js	2017-11-25 06:41:20.000000000 +0100
++++ b/browser/main/Main.js	2017-11-25 08:49:38.187934938 +0100
+@@ -11,7 +11,6 @@
+ import ConfigManager from 'browser/main/lib/ConfigManager'
  import modal from 'browser/main/lib/modal'
  import InitModal from 'browser/main/modals/InitModal'
- import mixpanel from 'browser/main/lib/mixpanel'
 -import mobileAnalytics from 'browser/main/lib/AwsMobileAnalyticsConfig'
  import eventEmitter from 'browser/main/lib/eventEmitter'
- import RealtimeNotification from 'browser/components/RealtimeNotification'
  
-@@ -25,10 +24,6 @@
+ class Main extends React.Component {
+@@ -19,10 +18,6 @@
    constructor (props) {
      super(props)
  
@@ -134,8 +134,8 @@ diff -ura a/browser/main/Main.js b/browser/main/Main.js
  
      this.state = {
 diff -ura a/browser/main/modals/CreateFolderModal.js b/browser/main/modals/CreateFolderModal.js
---- a/browser/main/modals/CreateFolderModal.js	2017-10-28 07:15:41.000000000 +0200
-+++ b/browser/main/modals/CreateFolderModal.js	2017-10-28 16:43:00.398082262 +0200
+--- a/browser/main/modals/CreateFolderModal.js	2017-11-25 06:41:20.000000000 +0100
++++ b/browser/main/modals/CreateFolderModal.js	2017-11-25 08:49:54.078019153 +0100
 @@ -5,7 +5,6 @@
  import store from 'browser/main/store'
  import consts from 'browser/lib/consts'
@@ -153,8 +153,8 @@ diff -ura a/browser/main/modals/CreateFolderModal.js b/browser/main/modals/Creat
        let { storage } = this.props
        let input = {
 diff -ura a/browser/main/modals/NewNoteModal.js b/browser/main/modals/NewNoteModal.js
---- a/browser/main/modals/NewNoteModal.js	2017-10-28 07:15:41.000000000 +0200
-+++ b/browser/main/modals/NewNoteModal.js	2017-10-28 16:42:58.998057921 +0200
+--- a/browser/main/modals/NewNoteModal.js	2017-11-25 06:41:20.000000000 +0100
++++ b/browser/main/modals/NewNoteModal.js	2017-11-25 08:50:13.178120381 +0100
 @@ -5,7 +5,6 @@
  import { hashHistory } from 'react-router'
  import ee from 'browser/main/lib/eventEmitter'
@@ -182,17 +182,17 @@ diff -ura a/browser/main/modals/NewNoteModal.js b/browser/main/modals/NewNoteMod
  
      dataApi
 diff -ura a/browser/main/modals/PreferencesModal/InfoTab.js b/browser/main/modals/PreferencesModal/InfoTab.js
---- a/browser/main/modals/PreferencesModal/InfoTab.js	2017-10-28 07:15:41.000000000 +0200
-+++ b/browser/main/modals/PreferencesModal/InfoTab.js	2017-10-28 16:43:17.828385961 +0200
+--- a/browser/main/modals/PreferencesModal/InfoTab.js	2017-11-25 06:41:20.000000000 +0100
++++ b/browser/main/modals/PreferencesModal/InfoTab.js	2017-11-25 08:52:13.558758387 +0100
 @@ -3,7 +3,6 @@
  import styles from './InfoTab.styl'
  import ConfigManager from 'browser/main/lib/ConfigManager'
  import store from 'browser/main/store'
 -import AwsMobileAnalyticsConfig from 'browser/main/lib/AwsMobileAnalyticsConfig'
+ import _ from 'lodash'
  
  const electron = require('electron')
- const { shell, remote } = electron
-@@ -23,29 +22,6 @@
+@@ -24,47 +23,6 @@
      e.preventDefault()
    }
  
@@ -209,8 +209,21 @@ diff -ura a/browser/main/modals/PreferencesModal/InfoTab.js b/browser/main/modal
 -
 -    if (!newConfig.amaEnabled) {
 -      AwsMobileAnalyticsConfig.recordDynamicCustomEvent('DISABLE_AMA')
+-      this.setState({
+-        amaMessage: 'We hope we will gain your trust'
+-      })
+-    } else {
+-      this.setState({
+-        amaMessage: 'Thank\'s for trust us'
+-      })
 -    }
 -
+-    _.debounce(() => {
+-      this.setState({
+-        amaMessage: ''
+-      })
+-    }, 3000)()
+-
 -    ConfigManager.set(newConfig)
 -
 -    store.dispatch({
@@ -219,14 +232,21 @@ diff -ura a/browser/main/modals/PreferencesModal/InfoTab.js b/browser/main/modal
 -    })
 -  }
 -
+-  infoMessage () {
+-    const { amaMessage } = this.state
+-    return amaMessage ? <p styleName='policy-confirm'>{amaMessage}</p> : null
+-  }
+-
    render () {
      return (
        <div styleName='root'>
-@@ -95,18 +71,6 @@
+@@ -134,21 +92,6 @@
              License: GPL v3
            </li>
          </ul>
--        <hr />
+-
+-        <hr styleName='separate-line' />
+-
 -        <div styleName='policy'>Data collection policy</div>
 -        <div>We collect only the number of DAU for Boostnote and **DO NOT collect** any detail information such as your note content.</div>
 -        <div>You can see how it works on <a href='https://github.com/BoostIO/Boostnote' onClick={(e) => this.handleLinkClick(e)}>GitHub</a>.</div>
@@ -238,12 +258,13 @@ diff -ura a/browser/main/modals/PreferencesModal/InfoTab.js b/browser/main/modal
 -        />
 -        Enable to send analytics to our servers<br />
 -        <button styleName='policy-submit' onClick={(e) => this.handleSaveButtonClick(e)}>Save</button>
+-        {this.infoMessage()}
        </div>
      )
    }
 diff -ura a/package.json b/package.json
---- a/package.json	2017-10-28 07:15:41.000000000 +0200
-+++ b/package.json	2017-10-28 16:55:58.360290459 +0200
+--- a/package.json	2017-11-25 06:41:20.000000000 +0100
++++ b/package.json	2017-11-25 08:52:24.738817641 +0100
 @@ -50,8 +50,6 @@
    "dependencies": {
      "@rokt33r/markdown-it-math": "^4.0.1",