If ledger not enabled, honor settings for clearing history

Fixes #8495
brave · Apr 26, 2017 · 5aeed54 · 5aeed54
1 parent b3e0e98
commit 5aeed54
Show file tree

Hide file tree

Showing 3 changed files with 210 additions and 66 deletions.
diff --git a/app/ledger.js b/app/ledger.js
@@ -9,11 +9,12 @@
    module entry points:
      init()   - called by app/index.js   to start module
      quit()   -   ..   ..   ..     ..    prior to browser quitting
-     boot()   -   ..   ..   ..      ..   to create wallet
+     boot()   -   ..   ..   ..     ..    to create wallet
+     reset()  -   ..   ..   ..     ..    to remove state
 
    IPC entry point:
-      LEDGER_PUBLISHER - called synchronously by app/extensions/brave/content/scripts/pageInformation.js
-      CHANGE_SETTING - called asynchronously to record a settings change
+      LEDGER_PUBLISHER  - called synchronously by app/extensions/brave/content/scripts/pageInformation.js
+      CHANGE_SETTING    - called asynchronously to record a settings change
 
    eventStore entry point:
       addChangeListener - called when tabs render or gain focus
@@ -99,6 +100,7 @@ const clientOptions = {
 }
 
 var doneTimer
+var quitP
 
 var v2RulesetDB
 const v2RulesetPath = 'ledger-rulesV2.leveldb'
@@ -159,6 +161,10 @@ const doAction = (action) => {
       quit()
       break
 
+    case appConstants.APP_CLEAR_HISTORY:
+      if (!getSetting(settings.PAYMENTS_ENABLED)) reset(true)
+      break
+
     case appConstants.APP_IDLE_STATE_CHANGED:
       visit('NOOP', underscore.now(), null)
       break
@@ -252,19 +258,23 @@ const doAction = (action) => {
 /*
  * module entry points
  */
+
 var init = () => {
   try {
     appDispatcher.register(doAction)
     initialize(getSetting(settings.PAYMENTS_ENABLED))
 
-    doneTimer = setInterval(doneWriter, 1 * msecs.hour)
+    doneTimer = setInterval(doneWriter, 1 * msecs.minute)
   } catch (ex) { console.log('ledger.js initialization failed: ' + ex.toString() + '\n' + ex.stack) }
 }
 
 var quit = () => {
+  quitP = true
   visit('NOOP', underscore.now(), null)
   clearInterval(doneTimer)
   doneWriter()
+
+  if ((!getSetting(settings.PAYMENTS_ENABLED)) && (getSetting(settings.SHUTDOWN_CLEAR_HISTORY))) reset(true)
 }
 
 var boot = () => {
@@ -294,6 +304,17 @@ var boot = () => {
   })
 }
 
+var reset = (doneP) => {
+  var files = [ logPath, publisherPath, scoresPath, synopsisPath ]
+
+  if (!doneP) files.push(statePath)
+  files.forEach((file) => {
+    fs.unlink(pathName(file), (err) => {
+      if ((err) && (err.code !== 'ENOENT')) console.log(err)
+    })
+  })
+}
+
 /*
  * Print or Save Recovery Keys
  */
@@ -800,29 +821,8 @@ var enable = (paymentsEnabled) => {
     // change undefined include publishers to include publishers
     appActions.enableUndefinedPublishers(synopsis.publishers)
 
-    fs.readFile(pathName(publisherPath), (err, data) => {
-      if (err) {
-        if (err.code !== 'ENOENT') console.log('publisherPath read error: ' + err.toString())
-        return
-      }
-
-      if (publisherInfo._internal.verboseP) console.log('\nfound ' + pathName(publisherPath))
-      try {
-        data = JSON.parse(data)
-        underscore.keys(data).sort().forEach((publisher) => {
-          var entries = data[publisher]
-
-          publishers[publisher] = {}
-          entries.forEach((entry) => {
-            locations[entry.location] = entry
-            publishers[publisher][entry.location] = { timestamp: entry.when, tabIds: [] }
-            updateLocation(entry.location, publisher)
-          })
-        })
-      } catch (ex) {
-        console.log('publishersPath parse error: ' + ex.toString())
-      }
-    })
+    fs.unlink(pathName(publisherPath), (err) => { if ((err) && (err.code !== 'ENOENT')) console.log(err) })
+    fs.unlink(pathName(scoresPath), (err) => { if ((err) && (err.code !== 'ENOENT')) console.log(err) })
   })
 }
 
@@ -967,22 +967,7 @@ const fetchFavIcon = (entry, url, redirects) => {
 }
 
 var updatePublisherInfo = (changedPublisher) => {
-  var data = {}
-  var then = underscore.now() - msecs.week
-
-  underscore.keys(publishers).sort().forEach((publisher) => {
-    var entries = []
-
-    underscore.keys(publishers[publisher]).forEach((location) => {
-      var when = publishers[publisher][location].timestamp
-
-      if (when > then) entries.push({ location: location, when: when })
-    })
-
-    if (entries.length > 0) data[publisher] = entries
-  })
-  atomicWriter(pathName(publisherPath), data, () => {})
-  atomicWriter(pathName(scoresPath), synopsis.allN(), () => {})
+  var data
 
   atomicWriter(pathName(synopsisPath), synopsis, () => {})
   if (!publisherInfo._internal.enabled) return
@@ -2104,6 +2089,15 @@ var atomicWriter = (path, obj, options, cb) => {
       return cb(err)
     }
 
+    if ((quitP) && (!getSetting(settings.PAYMENTS_ENABLED)) && (getSetting(settings.SHUTDOWN_CLEAR_HISTORY))) {
+      if (ledgerInfo._internal.debugP) console.log('\ndeleting ' + path + suffix)
+      fs.unlink(path + suffix, (err) => {
+        if (err) console.log('unlink error: ' + err.toString())
+        cb(err)
+      })
+      return
+    }
+
     if (ledgerInfo._internal.debugP) console.log('\nrenaming ' + path + suffix)
     fs.rename(path + suffix, path, (err) => {
       if (err) console.log('rename error: ' + err.toString())
@@ -2131,7 +2125,7 @@ var pathName = (name) => {
   return path.join(app.getPath('userData'), parts.name + parts.ext)
 }
 
-/**
+/*
  * UI controller functionality
  */
 
@@ -2274,5 +2268,6 @@ module.exports = {
   recoverKeys: recoverKeys,
   backupKeys: backupKeys,
   quit: quit,
-  boot: boot
+  boot: boot,
+  reset: reset
 }
diff --git a/js/about/preferences.js b/js/about/preferences.js
@@ -583,7 +583,7 @@ class SecurityTab extends ImmutableComponent {
     return <div>
       <div className='sectionTitle' data-l10n-id='privateData' />
       <SettingsList dataL10nId='privateDataMessage'>
-        <SettingCheckbox dataL10nId='browsingHistory' prefKey={settings.SHUTDOWN_CLEAR_HISTORY} settings={this.props.settings} onChangeSetting={this.props.onChangeSetting} />
+        <SettingCheckbox dataTestId='clearBrowsingHistory' dataL10nId='browsingHistory' prefKey={settings.SHUTDOWN_CLEAR_HISTORY} settings={this.props.settings} onChangeSetting={this.props.onChangeSetting} />
         <SettingCheckbox dataL10nId='downloadHistory' prefKey={settings.SHUTDOWN_CLEAR_DOWNLOADS} settings={this.props.settings} onChangeSetting={this.props.onChangeSetting} />
         <SettingCheckbox dataL10nId='cachedImagesAndFiles' prefKey={settings.SHUTDOWN_CLEAR_CACHE} settings={this.props.settings} onChangeSetting={this.props.onChangeSetting} />
         <SettingCheckbox dataL10nId='allSiteCookies' prefKey={settings.SHUTDOWN_CLEAR_ALL_SITE_COOKIES} settings={this.props.settings} onChangeSetting={this.props.onChangeSetting} />