Merge pull request #8387 from brave/fix/sync-72

updating sync to match brave/sync#73
brave · Apr 19, 2017 · 6ed7739 · 6ed7739
2 parents 22dc2b2 + e5c4a16
commit 6ed7739
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/app/sync.js b/app/sync.js
@@ -356,7 +356,7 @@ module.exports.init = function (appState) {
     }
     appActions.setSyncSetupError(error || locale.translation('unknownError'))
   })
-  ipcMain.on(messages.GET_EXISTING_OBJECTS, (event, categoryName, records, lastRecordTimestamp) => {
+  ipcMain.on(messages.GET_EXISTING_OBJECTS, (event, categoryName, records) => {
     if (!syncEnabled()) {
       return
     }

diff --git a/js/constants/sync/messages.js b/js/constants/sync/messages.js
@@ -61,8 +61,10 @@ const messages = {
    * webview -> browser
    * after sync gets records, it requests the browser's existing objects so sync
    * can perform conflict resolution.
+   * isTruncated is true if limitResponse was used and the total number of
+   * records exceeds the limit (1000).
    */
-  GET_EXISTING_OBJECTS: _, /* @param {string} categoryName, @param {Array.<Object>} records */
+  GET_EXISTING_OBJECTS: _, /* @param {string} categoryName, @param {Array.<Object>} records, @param {lastRecordTimeStamp} number, @param {boolean} isTruncated */
   /**
    * browser -> webview
    * webview resolves sync records against matching browser objects and returns