diff --git a/app/sync.js b/app/sync.js index 0fdd551aa2d..3ed5aa9f138 100644 --- a/app/sync.js +++ b/app/sync.js @@ -189,11 +189,19 @@ module.exports.onSyncReady = (isFirstRun, e) => { * @param {Immutable.Map} site */ const folderToObjectId = {} - const syncBookmark = (site) => { - if (!site || (site.get('objectId') && seed.equals(site.get('originalSeed'))) || - folderToObjectId[site.get('folderId')] || !syncUtil.isSyncable('bookmark', site)) { - return + const shouldSyncBookmark = (site) => { + if (!site) { return false } + // originalSeed is set on reset to prevent synced bookmarks on a device + // from being re-synced. + const originalSeed = site.get('originalSeed') + if (site.get('objectId') && (!originalSeed || seed.equals(originalSeed))) { + return false } + if (folderToObjectId[site.get('folderId')]) { return false } + return syncUtil.isSyncable('bookmark', site) + } + const syncBookmark = (site) => { + if (!shouldSyncBookmark(site)) { return } const siteJS = site.toJS()