address review comments

brave · Feb 18, 2017 · cce94a0 · cce94a0
1 parent b7e0781
commit cce94a0
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 23 deletions.
diff --git a/app/sync.js b/app/sync.js
@@ -154,11 +154,11 @@ const doAction = (sender, action) => {
  * @param {Event} e
  */
 module.exports.onSyncReady = (isFirstRun, e) => {
-  initialized = true
   if (!syncEnabled()) {
     return
   }
-  if (isFirstRun) {
+  if (!initialized && isFirstRun) {
+    initialized = true
     // Sync the device id for this device
     sendSyncRecords(e.sender, writeActions.CREATE, [{
       name: 'device',
@@ -301,7 +301,7 @@ module.exports.init = function (initialState) {
     }
   })
   ipcMain.on(messages.SYNC_READY, module.exports.onSyncReady.bind(null,
-    initialized ? false : !initialState.seed && !initialState.deviceId))
+    !initialState.seed && !initialState.deviceId))
   ipcMain.on(messages.SYNC_DEBUG, (e, msg) => {
     log(msg)
   })
@@ -324,18 +324,19 @@ module.exports.init = function (initialState) {
     if (!records || !records.length) {
       return
     }
-    let showBookmarksToolbar = false
     if (!initialState.seed) {
       // syncing for the first time
-      const bookmarks = (AppStore.getState().get('sites') || new Immutable.List()).filter((site) => {
-        const tags = site.get('tags')
-        return tags && (tags.includes('bookmark') || tags.includes('bookmark-folder'))
-      })
+      const bookmarks = siteUtil.getBookmarks(AppStore.getState().get('sites'))
       if (!bookmarks.size) {
-        showBookmarksToolbar = true
+        for (const record of records) {
+          if (record && record.objectData === 'bookmark') {
+            appActions.changeSetting(settings.SHOW_BOOKMARKS_TOOLBAR, true)
+            break
+          }
+        }
       }
     }
-    syncUtil.applySyncRecords(records, showBookmarksToolbar)
+    syncUtil.applySyncRecords(records)
   })
 }
 

diff --git a/js/state/syncUtil.js b/js/state/syncUtil.js
@@ -6,7 +6,6 @@
 const Immutable = require('immutable')
 const writeActions = require('../constants/sync/proto').actions
 const siteUtil = require('./siteUtil')
-const settings = require('../constants/settings')
 
 const CATEGORY_MAP = {
   bookmark: {
@@ -55,10 +54,9 @@ const pickFields = (object, fields) => {
 /**
  * Apply a bookmark or historySite SyncRecord to the browser data store.
  * @param {Object} record
- * @param {boolean} showBookmarksToolbar
  * @param {Immutable.Map} siteDetail
  */
-const applySiteRecord = (record, showBookmarksToolbar = false) => {
+const applySiteRecord = (record) => {
   const appActions = require('../actions/appActions')
   const siteTags = require('../constants/siteTags')
   const objectId = new Immutable.List(record.objectId)
@@ -97,9 +95,6 @@ const applySiteRecord = (record, showBookmarksToolbar = false) => {
   switch (record.action) {
     case writeActions.CREATE:
       appActions.addSite(siteDetail, tag, undefined, undefined, true)
-      if (showBookmarksToolbar && record.objectData === 'bookmark') {
-        appActions.changeSetting(settings.SHOW_BOOKMARKS_TOOLBAR, true)
-      }
       break
     case writeActions.UPDATE:
       appActions.addSite(siteDetail, tag, existingObjectData, null, true)
@@ -171,17 +166,16 @@ const applySiteSettingRecord = (record) => {
 /**
  * Given a SyncRecord, apply it to the browser data store.
  * @param {Object} record
- * @param {boolean} showBookmarksToolbar
  */
-module.exports.applySyncRecord = (record, showBookmarksToolbar) => {
+module.exports.applySyncRecord = (record) => {
   if (!record || !record.objectData) {
     console.log(`Warning: Can't apply empty record: ${record}`)
     return
   }
   switch (record.objectData) {
     case 'bookmark':
     case 'historySite':
-      applySiteRecord(record, showBookmarksToolbar)
+      applySiteRecord(record)
       break
     case 'siteSetting':
       applySiteSettingRecord(record)
@@ -197,14 +191,13 @@ module.exports.applySyncRecord = (record, showBookmarksToolbar) => {
 /**
  * Apply several SyncRecords in a less blocking manner.
  * @param {Array<Object>} records
- * @param {boolean} showBookmarksToolbar
  */
-module.exports.applySyncRecords = (records, showBookmarksToolbar) => {
+module.exports.applySyncRecords = (records) => {
   if (!records || records.length === 0) { return }
   setImmediate(() => {
     const record = records.shift()
-    module.exports.applySyncRecord(record, showBookmarksToolbar)
-    module.exports.applySyncRecords(records, showBookmarksToolbar)
+    module.exports.applySyncRecord(record)
+    module.exports.applySyncRecords(records)
   })
 }