Updated to v0.8.21

1 files changed, 51 insertions, 40 deletions

diff --git a/remove-analytics.patch b/remove-analytics.patch
index a897534e5422..1af8f0678f3a 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	2018-01-13 11:01:53.000000000 +0100
-+++ b/browser/finder/index.js	2018-01-13 14:08:29.828697553 +0100
+--- a/browser/finder/index.js	2018-02-03 07:52:51.000000000 +0100
++++ b/browser/finder/index.js	2018-02-03 15:36:52.253142218 +0100
 @@ -10,7 +10,6 @@
  import NoteList from './NoteList'
  import NoteDetail from './NoteDetail'
@@ -18,8 +18,8 @@ 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	2018-01-13 11:01:53.000000000 +0100
-+++ b/browser/main/Detail/MarkdownNoteDetail.js	2018-01-13 14:08:52.058188835 +0100
+--- a/browser/main/Detail/MarkdownNoteDetail.js	2018-02-03 07:52:51.000000000 +0100
++++ b/browser/main/Detail/MarkdownNoteDetail.js	2018-02-03 15:37:11.336600303 +0100
 @@ -15,7 +15,6 @@
  import StatusBar from '../StatusBar'
  import _ from 'lodash'
@@ -45,8 +45,8 @@ 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	2018-01-13 11:01:53.000000000 +0100
-+++ b/browser/main/Detail/SnippetNoteDetail.js	2018-01-13 14:09:33.567238910 +0100
+--- a/browser/main/Detail/SnippetNoteDetail.js	2018-02-03 07:52:51.000000000 +0100
++++ b/browser/main/Detail/SnippetNoteDetail.js	2018-02-03 15:37:47.246834593 +0100
 @@ -18,7 +18,6 @@
  import ConfigManager from 'browser/main/lib/ConfigManager'
  import _ from 'lodash'
@@ -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	2018-01-13 11:01:53.000000000 +0100
-+++ b/browser/main/Detail/TagSelect.js	2018-01-13 14:09:56.536713258 +0100
+--- a/browser/main/Detail/TagSelect.js	2018-02-03 07:52:51.000000000 +0100
++++ b/browser/main/Detail/TagSelect.js	2018-02-03 15:38:01.990263950 +0100
 @@ -3,7 +3,6 @@
  import CSSModules from 'browser/lib/CSSModules'
  import styles from './TagSelect.styl'
@@ -109,11 +109,11 @@ diff -ura a/browser/main/Detail/TagSelect.js b/browser/main/Detail/TagSelect.js
    submitTag () {
 -    AwsMobileAnalyticsConfig.recordDynamicCustomEvent('ADD_TAG')
      let { value } = this.props
-     const newTag = this.refs.newTag.value.trim().replace(/ +/g, '_')
- 
+     let newTag = this.refs.newTag.value.trim().replace(/ +/g, '_')
+     newTag = newTag.charAt(0) === '#' ? newTag.substring(1) : newTag
 diff -ura a/browser/main/Main.js b/browser/main/Main.js
---- a/browser/main/Main.js	2018-01-13 11:01:53.000000000 +0100
-+++ b/browser/main/Main.js	2018-01-13 14:10:12.586345968 +0100
+--- a/browser/main/Main.js	2018-02-03 07:52:51.000000000 +0100
++++ b/browser/main/Main.js	2018-02-03 15:38:15.547018829 +0100
 @@ -10,7 +10,6 @@
  import dataApi from 'browser/main/lib/dataApi'
  import _ from 'lodash'
@@ -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	2018-01-13 11:01:53.000000000 +0100
-+++ b/browser/main/modals/CreateFolderModal.js	2018-01-13 14:10:27.795997897 +0100
+--- a/browser/main/modals/CreateFolderModal.js	2018-02-03 07:52:51.000000000 +0100
++++ b/browser/main/modals/CreateFolderModal.js	2018-02-03 15:38:29.540443134 +0100
 @@ -6,7 +6,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
        const { storage } = this.props
        const input = {
 diff -ura a/browser/main/modals/NewNoteModal.js b/browser/main/modals/NewNoteModal.js
---- a/browser/main/modals/NewNoteModal.js	2018-01-13 11:01:53.000000000 +0100
-+++ b/browser/main/modals/NewNoteModal.js	2018-01-13 14:10:46.655566300 +0100
+--- a/browser/main/modals/NewNoteModal.js	2018-02-03 07:52:51.000000000 +0100
++++ b/browser/main/modals/NewNoteModal.js	2018-02-03 15:38:47.527226622 +0100
 @@ -5,7 +5,6 @@
  import { hashHistory } from 'react-router'
  import ee from 'browser/main/lib/eventEmitter'
@@ -182,8 +182,8 @@ 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	2018-01-13 11:01:53.000000000 +0100
-+++ b/browser/main/modals/PreferencesModal/InfoTab.js	2018-01-13 14:11:58.000000000 +0100
+--- a/browser/main/modals/PreferencesModal/InfoTab.js	2018-02-03 07:52:51.000000000 +0100
++++ b/browser/main/modals/PreferencesModal/InfoTab.js	2018-02-03 15:39:27.410818543 +0100
 @@ -3,7 +3,6 @@
  import styles from './InfoTab.styl'
  import ConfigManager from 'browser/main/lib/ConfigManager'
@@ -203,7 +203,7 @@ diff -ura a/browser/main/modals/PreferencesModal/InfoTab.js b/browser/main/modal
 -  }
 -
 -  handleSaveButtonClick (e) {
--    let newConfig = {
+-    const newConfig = {
 -      amaEnabled: this.state.config.amaEnabled
 -    }
 -
@@ -240,38 +240,40 @@ diff -ura a/browser/main/modals/PreferencesModal/InfoTab.js b/browser/main/modal
    render () {
      return (
        <div styleName='root'>
-@@ -136,19 +94,6 @@
+@@ -136,21 +94,6 @@
          </ul>
  
          <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 styleName='policy'>Analytics</div>
+-        <div>Boostnote collects anonymous data for the sole purpose of improving the application, and strictly does not collect any personal information such the contents of your notes.</div>
 -        <div>You can see how it works on <a href='https://github.com/BoostIO/Boostnote' onClick={(e) => this.handleLinkClick(e)}>GitHub</a>.</div>
--        <div>This data is only used for Boostnote improvements.</div>
+-        <br />
+-        <div>You can choose to enable or disable this option.</div>
 -        <input onChange={(e) => this.handleConfigChange(e)}
 -          checked={this.state.config.amaEnabled}
 -          ref='amaEnabled'
 -          type='checkbox'
 -        />
--        Enable to send analytics to our servers<br />
+-        Enable analytics to help improve Boostnote<br />
 -        <button styleName='policy-submit' onClick={(e) => this.handleSaveButtonClick(e)}>Save</button>
+-        <br />
 -        {this.infoMessage()}
        </div>
      )
    }
 diff -ura a/browser/main/NoteList/index.js b/browser/main/NoteList/index.js
---- a/browser/main/NoteList/index.js	2018-01-13 11:01:53.000000000 +0100
-+++ b/browser/main/NoteList/index.js	2018-01-13 14:12:12.713596882 +0100
-@@ -15,7 +15,6 @@
- import markdown from 'browser/lib/markdownTextHelper'
- import { findNoteTitle } from 'browser/lib/findNoteTitle'
- import store from 'browser/main/store'
+--- a/browser/main/NoteList/index.js	2018-02-03 07:52:51.000000000 +0100
++++ b/browser/main/NoteList/index.js	2018-02-03 15:40:59.288078781 +0100
+@@ -13,7 +13,6 @@
+ import fs from 'fs'
+ import path from 'path'
+ import { hashHistory } from 'react-router'
 -import AwsMobileAnalyticsConfig from 'browser/main/lib/AwsMobileAnalyticsConfig'
  
  const { remote } = require('electron')
  const { Menu, MenuItem, dialog } = remote
-@@ -535,7 +534,6 @@
+@@ -536,7 +535,6 @@
              note: newNote
            })
          })
@@ -279,15 +281,24 @@ diff -ura a/browser/main/NoteList/index.js b/browser/main/NoteList/index.js
          console.log('Notes went to trash')
        })
        .catch((err) => {
+@@ -555,8 +553,6 @@
+     const firstNote = selectedNotes[0]
+     const eventName = firstNote.type === 'MARKDOWN_NOTE' ? 'ADD_MARKDOWN' : 'ADD_SNIPPET'
+ 
+-    AwsMobileAnalyticsConfig.recordDynamicCustomEvent(eventName)
+-    AwsMobileAnalyticsConfig.recordDynamicCustomEvent('ADD_ALLNOTE')
+     dataApi
+       .createNote(storage.key, {
+         type: firstNote.type,
 diff -ura a/package.json b/package.json
---- a/package.json	2018-01-13 14:04:26.504265000 +0100
-+++ b/package.json	2018-01-13 14:12:26.173288861 +0100
+--- a/package.json	2018-02-03 07:52:51.000000000 +0100
++++ b/package.json	2018-02-03 15:41:10.458150760 +0100
 @@ -50,8 +50,6 @@
    "dependencies": {
-     "@rokt33r/markdown-it-math": "4.0.2",
-     "@rokt33r/season": "5.3.1",
--    "aws-sdk": "2.48.0",
--    "aws-sdk-mobile-analytics": "0.9.2",
-     "codemirror": "5.26.0",
-     "codemirror-mode-elixir": "1.1.1",
-     "electron-config": "0.2.1",
+     "@rokt33r/markdown-it-math": "^4.0.1",
+     "@rokt33r/season": "^5.3.0",
+-    "aws-sdk": "^2.48.0",
+-    "aws-sdk-mobile-analytics": "^0.9.2",
+     "codemirror": "^5.19.0",
+     "codemirror-mode-elixir": "^1.1.1",
+     "electron-config": "^0.2.1",