Removal of analytics for v0.8.12

3 files changed, 140 insertions, 45 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0949d2ece979..d13577973dac 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = boostnote
 	pkgdesc = Open source note-taking app for programmers
 	pkgver = 0.8.12
-	pkgrel = 1
+	pkgrel = 2
 	url = https://boostnote.io/
 	arch = any
 	license = GPL3
@@ -14,12 +14,12 @@ pkgbase = boostnote
 	source = boostnote.js
 	source = boostnote.desktop
 	source = warning-fix.patch
-	source = disable-analytics.patch
+	source = no-analytics.patch
 	sha512sums = aca35f68c7d579191e0019db873352b9cbce1206b4728cd0e1d609dcffc8bd02236aa6d383b97738950837eecb7ee1d14b91a03c6666f80445bfd5db2891e6dc
 	sha512sums = f0abbdcca34d7f74d3dc66ffc2d0995416e7708c715d55fa58c4c2abc31d191ea42f3434e3105292b4817f83ac0ca89f456f5f93007ae80ab2426c8941f615f9
 	sha512sums = 18bcda13580da8ceeaa86793a77ec00a053b8fd51451dad7e2b1a19553fe1a467ac647b44b789212e783f3f6a80968cc9404e884ef7ff6b1f6588473b3229d40
 	sha512sums = 64fb4c4823744322b5777736fc1792fb377e433608b5456cb0e0b7053507d104a1bbe3fdc6fe193b41dfddadc1943e8220a27e26ec6d4166704f3e61e2572437
-	sha512sums = 951a57d051d6961563915bd480155bdb28b0e779716311c657f5cfca63b4fdaa9d71de2dc3a12cdf3d57f4a0b0a735a7599781a8085c7189be40d5974f065fb9
+	sha512sums = 90880e017bc0ad55ca2e0e7e27cdc2424e8cefce3f7363c1a2edd998b0af7075b28d98257ed8a9eed0a9744392aba8d6cfa52189891224f8784bc4c7699ad8b9
 
 pkgname = boostnote
 
diff --git a/PKGBUILD b/PKGBUILD
index 88e1e9ed27fe..d2a09b6afb6a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
 pkgname=boostnote
 _pkgname=Boostnote
 pkgver=0.8.12
-pkgrel=1
+pkgrel=2
 pkgdesc="Open source note-taking app for programmers"
 arch=('any')
 url="https://boostnote.io/"
@@ -19,7 +19,7 @@ source=(
   "${pkgname}.js"
   "${pkgname}.desktop"
   "warning-fix.patch"
-  "disable-analytics.patch"
+  "no-analytics.patch"
   )
 
 sha512sums=(
@@ -27,14 +27,14 @@ sha512sums=(
   'f0abbdcca34d7f74d3dc66ffc2d0995416e7708c715d55fa58c4c2abc31d191ea42f3434e3105292b4817f83ac0ca89f456f5f93007ae80ab2426c8941f615f9'
   '18bcda13580da8ceeaa86793a77ec00a053b8fd51451dad7e2b1a19553fe1a467ac647b44b789212e783f3f6a80968cc9404e884ef7ff6b1f6588473b3229d40'
   '64fb4c4823744322b5777736fc1792fb377e433608b5456cb0e0b7053507d104a1bbe3fdc6fe193b41dfddadc1943e8220a27e26ec6d4166704f3e61e2572437'
-  '951a57d051d6961563915bd480155bdb28b0e779716311c657f5cfca63b4fdaa9d71de2dc3a12cdf3d57f4a0b0a735a7599781a8085c7189be40d5974f065fb9'
+  '90880e017bc0ad55ca2e0e7e27cdc2424e8cefce3f7363c1a2edd998b0af7075b28d98257ed8a9eed0a9744392aba8d6cfa52189891224f8784bc4c7699ad8b9'
   )
 
 prepare() {
   cd "${_pkgname}-${pkgver}"
 
   patch -Np1 -i "${srcdir}/warning-fix.patch"
-  patch -Np1 -i "${srcdir}/disable-analytics.patch"
+  patch -Np1 -i "${srcdir}/no-analytics.patch"
 }
 
 build() {
diff --git a/no-analytics.patch b/no-analytics.patch
index ef21e1a49cd4..1478d538dbe9 100644
--- a/no-analytics.patch
+++ b/no-analytics.patch
@@ -1,6 +1,6 @@
 diff -ura a/browser/finder/index.js b/browser/finder/index.js
---- a/browser/finder/index.js	2017-06-24 06:28:49.000000000 +0200
-+++ b/browser/finder/index.js	2017-07-20 08:32:42.563239708 +0200
+--- a/browser/finder/index.js	2017-07-29 08:04:53.000000000 +0200
++++ b/browser/finder/index.js	2017-07-29 09:15:29.836430857 +0200
 @@ -10,7 +10,6 @@
  import NoteList from './NoteList'
  import NoteDetail from './NoteDetail'
@@ -13,67 +13,67 @@ diff -ura a/browser/finder/index.js b/browser/finder/index.js
  
      if (e.keyCode === 13) {
        this.refs.detail.saveToClipboard()
--      AwsMobileAnalyticsConfig.recordDynamitCustomEvent('COPY_FINDER')
+-      AwsMobileAnalyticsConfig.recordDynamicCustomEvent('COPY_FINDER')
        hideFinder()
        e.preventDefault()
      }
 diff -ura a/browser/main/Detail/MarkdownNoteDetail.js b/browser/main/Detail/MarkdownNoteDetail.js
---- a/browser/main/Detail/MarkdownNoteDetail.js	2017-06-24 06:28:49.000000000 +0200
-+++ b/browser/main/Detail/MarkdownNoteDetail.js	2017-07-20 08:32:12.599711118 +0200
+--- a/browser/main/Detail/MarkdownNoteDetail.js	2017-07-29 08:04:53.000000000 +0200
++++ b/browser/main/Detail/MarkdownNoteDetail.js	2017-07-29 09:17:01.436368456 +0200
 @@ -13,7 +13,6 @@
  import StatusBar from '../StatusBar'
  import _ from 'lodash'
  import { findNoteTitle } from 'browser/lib/findNoteTitle'
 -import AwsMobileAnalyticsConfig from 'browser/main/lib/AwsMobileAnalyticsConfig'
- 
- const electron = require('electron')
- const { remote } = electron
-@@ -117,7 +116,6 @@
+ import TrashButton from './TrashButton'
+ import InfoButton from './InfoButton'
+ import InfoPanel from './InfoPanel'
+@@ -121,7 +120,6 @@
            type: 'UPDATE_NOTE',
            note: note
          })
--        AwsMobileAnalyticsConfig.recordDynamitCustomEvent('EDIT_NOTE')
+-        AwsMobileAnalyticsConfig.recordDynamicCustomEvent('EDIT_NOTE')
        })
    }
  
-@@ -156,7 +154,6 @@
+@@ -160,7 +158,6 @@
  
    handleStarButtonClick (e) {
      let { note } = this.state
--    if (!note.isStarred) AwsMobileAnalyticsConfig.recordDynamitCustomEvent('ADD_STAR')
+-    if (!note.isStarred) AwsMobileAnalyticsConfig.recordDynamicCustomEvent('ADD_STAR')
  
      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-06-24 06:28:49.000000000 +0200
-+++ b/browser/main/Detail/SnippetNoteDetail.js	2017-07-20 08:31:34.192793920 +0200
+--- a/browser/main/Detail/SnippetNoteDetail.js	2017-07-29 08:04:53.000000000 +0200
++++ b/browser/main/Detail/SnippetNoteDetail.js	2017-07-29 09:17:39.492978037 +0200
 @@ -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'
- 
- function pass (name) {
-   switch (name) {
-@@ -111,7 +110,6 @@
+ import TrashButton from './TrashButton'
+ import InfoButton from './InfoButton'
+ import InfoPanel from './InfoPanel'
+@@ -115,7 +114,6 @@
            type: 'UPDATE_NOTE',
            note: note
          })
--        AwsMobileAnalyticsConfig.recordDynamitCustomEvent('EDIT_NOTE')
+-        AwsMobileAnalyticsConfig.recordDynamicCustomEvent('EDIT_NOTE')
        })
    }
  
-@@ -150,7 +148,6 @@
+@@ -154,7 +152,6 @@
  
    handleStarButtonClick (e) {
      let { note } = this.state
--    if (!note.isStarred) AwsMobileAnalyticsConfig.recordDynamitCustomEvent('ADD_STAR')
+-    if (!note.isStarred) AwsMobileAnalyticsConfig.recordDynamicCustomEvent('ADD_STAR')
  
      note.isStarred = !note.isStarred
  
 diff -ura a/browser/main/Detail/TagSelect.js b/browser/main/Detail/TagSelect.js
---- a/browser/main/Detail/TagSelect.js	2017-06-24 06:28:49.000000000 +0200
-+++ b/browser/main/Detail/TagSelect.js	2017-07-20 08:31:01.162578215 +0200
+--- a/browser/main/Detail/TagSelect.js	2017-07-29 08:04:53.000000000 +0200
++++ b/browser/main/Detail/TagSelect.js	2017-07-29 09:18:10.999584995 +0200
 @@ -2,7 +2,6 @@
  import CSSModules from 'browser/lib/CSSModules'
  import styles from './TagSelect.styl'
@@ -86,13 +86,24 @@ diff -ura a/browser/main/Detail/TagSelect.js b/browser/main/Detail/TagSelect.js
    }
  
    submitTag () {
--    AwsMobileAnalyticsConfig.recordDynamitCustomEvent('ADD_TAG')
+-    AwsMobileAnalyticsConfig.recordDynamicCustomEvent('ADD_TAG')
      let { value } = this.props
      let newTag = this.refs.newTag.value.trim().replace(/ +/g, '_')
  
+diff -ura a/browser/main/lib/ConfigManager.js b/browser/main/lib/ConfigManager.js
+--- a/browser/main/lib/ConfigManager.js	2017-07-29 08:04:53.000000000 +0200
++++ b/browser/main/lib/ConfigManager.js	2017-07-29 09:22:04.355519453 +0200
+@@ -15,7 +15,6 @@
+   navWidth: 200,
+   sortBy: 'UPDATED_AT', // 'CREATED_AT', 'UPDATED_AT', 'APLHABETICAL'
+   listStyle: 'DEFAULT', // 'DEFAULT', 'SMALL'
+-  amaEnabled: true,
+   hotkey: {
+     toggleFinder: OSX ? 'Cmd + Alt + S' : 'Super + Alt + S',
+     toggleMain: OSX ? 'Cmd + Alt + L' : 'Super + Alt + E'
 diff -ura a/browser/main/Main.js b/browser/main/Main.js
---- a/browser/main/Main.js	2017-06-24 06:28:49.000000000 +0200
-+++ b/browser/main/Main.js	2017-07-20 08:30:37.005753639 +0200
+--- a/browser/main/Main.js	2017-07-29 08:04:53.000000000 +0200
++++ b/browser/main/Main.js	2017-07-29 09:19:05.342790885 +0200
 @@ -12,7 +12,6 @@
  import modal from 'browser/main/lib/modal'
  import InitModal from 'browser/main/modals/InitModal'
@@ -113,8 +124,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-06-24 06:28:49.000000000 +0200
-+++ b/browser/main/modals/CreateFolderModal.js	2017-07-20 08:29:52.188793645 +0200
+--- a/browser/main/modals/CreateFolderModal.js	2017-07-29 08:04:53.000000000 +0200
++++ b/browser/main/modals/CreateFolderModal.js	2017-07-29 09:19:50.945995347 +0200
 @@ -5,7 +5,6 @@
  import store from 'browser/main/store'
  import consts from 'browser/lib/consts'
@@ -127,13 +138,13 @@ diff -ura a/browser/main/modals/CreateFolderModal.js b/browser/main/modals/Creat
    }
  
    confirm () {
--    AwsMobileAnalyticsConfig.recordDynamitCustomEvent('ADD_FOLDER')
+-    AwsMobileAnalyticsConfig.recordDynamicCustomEvent('ADD_FOLDER')
      if (this.state.name.trim().length > 0) {
        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-06-24 06:28:49.000000000 +0200
-+++ b/browser/main/modals/NewNoteModal.js	2017-07-20 08:29:20.798587895 +0200
+--- a/browser/main/modals/NewNoteModal.js	2017-07-29 08:04:53.000000000 +0200
++++ b/browser/main/modals/NewNoteModal.js	2017-07-29 09:20:27.279212901 +0200
 @@ -5,7 +5,6 @@
  import { hashHistory } from 'react-router'
  import ee from 'browser/main/lib/eventEmitter'
@@ -146,8 +157,8 @@ diff -ura a/browser/main/modals/NewNoteModal.js b/browser/main/modals/NewNoteMod
    }
  
    handleMarkdownNoteButtonClick (e) {
--    AwsMobileAnalyticsConfig.recordDynamitCustomEvent('ADD_MARKDOWN')
--    AwsMobileAnalyticsConfig.recordDynamitCustomEvent('ADD_ALLNOTE')
+-    AwsMobileAnalyticsConfig.recordDynamicCustomEvent('ADD_MARKDOWN')
+-    AwsMobileAnalyticsConfig.recordDynamicCustomEvent('ADD_ALLNOTE')
      let { storage, folder, dispatch, location } = this.props
      dataApi
        .createNote(storage, {
@@ -155,15 +166,99 @@ diff -ura a/browser/main/modals/NewNoteModal.js b/browser/main/modals/NewNoteMod
    }
  
    handleSnippetNoteButtonClick (e) {
--    AwsMobileAnalyticsConfig.recordDynamitCustomEvent('ADD_SNIPPET')
--    AwsMobileAnalyticsConfig.recordDynamitCustomEvent('ADD_ALLNOTE')
+-    AwsMobileAnalyticsConfig.recordDynamicCustomEvent('ADD_SNIPPET')
+-    AwsMobileAnalyticsConfig.recordDynamicCustomEvent('ADD_ALLNOTE')
      let { storage, folder, dispatch, location } = this.props
  
      dataApi
+diff -ura a/browser/main/modals/PreferencesModal/index.js b/browser/main/modals/PreferencesModal/index.js
+--- a/browser/main/modals/PreferencesModal/index.js	2017-07-29 08:04:53.000000000 +0200
++++ b/browser/main/modals/PreferencesModal/index.js	2017-07-29 09:24:26.231548394 +0200
+@@ -45,10 +45,7 @@
+     switch (this.state.currentTab) {
+       case 'INFO':
+         return (
+-          <InfoTab
+-            dispatch={dispatch}
+-            config={config}
+-          />
++          <InfoTab />
+         )
+       case 'HOTKEY':
+         return (
+diff -ura a/browser/main/modals/PreferencesModal/InfoTab.js b/browser/main/modals/PreferencesModal/InfoTab.js
+--- a/browser/main/modals/PreferencesModal/InfoTab.js	2017-07-29 08:04:53.000000000 +0200
++++ b/browser/main/modals/PreferencesModal/InfoTab.js	2017-07-29 09:23:38.431776264 +0200
+@@ -1,9 +1,6 @@
+ import React from 'react'
+ import CSSModules from 'browser/lib/CSSModules'
+ 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'
+ 
+ const electron = require('electron')
+ const { shell, remote } = electron
+@@ -14,7 +11,6 @@
+     super(props)
+ 
+     this.state = {
+-      config: this.props.config
+     }
+   }
+ 
+@@ -23,28 +19,6 @@
+     e.preventDefault()
+   }
+ 
+-  handleConfigChange (e) {
+-    const newConfig = { amaEnabled: this.refs.amaEnabled.checked }
+-
+-    this.setState({ config: newConfig })
+-  }
+-
+-  handleSaveButtonClick (e) {
+-    let newConfig = {
+-      amaEnabled: this.state.config.amaEnabled
+-    }
+-
+-    ConfigManager.set(newConfig)
+-
+-    store.dispatch({
+-      type: 'SET_CONFIG',
+-      config: newConfig
+-    })
+-    if (!newConfig.amaEnabled) {
+-      AwsMobileAnalyticsConfig.recordDynamicCustomEvent('DISABLE_AMA')
+-    }
+-  }
+-
+   render () {
+     return (
+       <div styleName='root'>
+@@ -94,18 +68,6 @@
+             License: GPL v3
+           </li>
+         </ul>
+-        <hr />
+-        <div styleName='policy'>Data collection policy</div>
+-        <p>We collect only the number of DAU for Boostnote and DO NOT collect any detail information</p>
+-        <p>such as your note content. You can see how it works on <a href='https://github.com/BoostIO/Boostnote' onClick={(e) => this.handleLinkClick(e)}>GitHub</a>.</p>
+-        <p>These data are only used for Boostnote improvements.</p>
+-        <input onChange={(e) => this.handleConfigChange(e)}
+-          checked={this.state.config.amaEnabled}
+-          ref='amaEnabled'
+-          type='checkbox'
+-        />
+-        Enable to send analytics to our servers<br />
+-        <button styleName='policy-submit' onClick={(e) => this.handleSaveButtonClick(e)}>Save</button>
+       </div>
+     )
+   }
 diff -ura a/package.json b/package.json
---- a/package.json	2017-06-24 06:28:49.000000000 +0200
-+++ b/package.json	2017-07-20 08:28:25.641559039 +0200
-@@ -50,8 +50,6 @@
+--- a/package.json	2017-07-29 08:04:53.000000000 +0200
++++ b/package.json	2017-07-29 09:20:48.735806094 +0200
+@@ -49,8 +49,6 @@
    "dependencies": {
      "@rokt33r/markdown-it-math": "^4.0.1",
      "@rokt33r/season": "^5.3.0",