rmorawski/standardnotes-app-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Handle sync conflicts

Browse Source
This commit is contained in:
Mo Bitar
2017-07-31 14:46:38 -05:00
parent 08ca3105ac
commit 2f2b870496
2 changed files with 20 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/assets/javascripts/app/frontend/controllers/home.js
View File

@@ -57,7 +57,6 @@ angular.module('app.frontend')
*/ */
$scope.updateTagsForNote = function(note, stringTags) { $scope.updateTagsForNote = function(note, stringTags) {
console.log("Updating tags", stringTags);
var toRemove = []; var toRemove = [];
for(var tag of note.tags) { for(var tag of note.tags) {
if(stringTags.indexOf(tag.title) === -1) { if(stringTags.indexOf(tag.title) === -1) {

47
app/assets/javascripts/app/services/syncManager.js
View File

@@ -272,6 +272,12 @@ class SyncManager {
} }
} }
handleItemsResponse(responseItems, omitFields) {
EncryptionHelper.decryptMultipleItems(responseItems, this.authManager.keys());
var items = this.modelManager.mapResponseItemsToLocalModelsOmittingFields(responseItems, omitFields);
return items;
}
handleUnsavedItemsResponse(unsaved) { handleUnsavedItemsResponse(unsaved) {
if(unsaved.length == 0) { if(unsaved.length == 0) {
return; return;
@@ -284,11 +290,25 @@ class SyncManager {
if (i < unsaved.length) { if (i < unsaved.length) {
var mapping = unsaved[i]; var mapping = unsaved[i];
var itemResponse = mapping.item; var itemResponse = mapping.item;
EncryptionHelper.decryptMultipleItems([itemResponse], this.authManager.keys());
var item = this.modelManager.findItem(itemResponse.uuid); var item = this.modelManager.findItem(itemResponse.uuid);
if(!item) {
// could be deleted
return;
}
var error = mapping.error; var error = mapping.error;
if(error.tag == "uuid_conflict") { if(error.tag == "uuid_conflict") {
// uuid conflicts can occur if a user attempts to import an old data archive with uuids from the old account into a new account // uuid conflicts can occur if a user attempts to import an old data archive with uuids from the old account into a new account
this.modelManager.alternateUUIDForItem(item, handleNext); this.modelManager.alternateUUIDForItem(item, handleNext);
} else if(error.tag === "sync_conflict") {
// create a new item with the same contents of this item if the contents differ
itemResponse.uuid = null; // we want a new uuid for the new item
var dup = this.modelManager.createItem(itemResponse);
if(!itemResponse.deleted && JSON.stringify(item.structureParams()) !== JSON.stringify(dup.structureParams())) {
this.modelManager.addItem(dup);
dup.conflict_of = item.uuid;
dup.setDirty(true);
}
} }
++i; ++i;
} else { } else {
@@ -299,33 +319,6 @@ class SyncManager {
handleNext(); handleNext();
} }
handleItemsResponse(responseItems, omitFields) {
EncryptionHelper.decryptMultipleItems(responseItems, this.authManager.keys());
var items = this.modelManager.mapResponseItemsToLocalModelsOmittingFields(responseItems, omitFields);
this.handleSyncConflicts(items);
return items;
}
handleSyncConflicts(items) {
var needsSync = false;
for(var item of items) {
if(item.conflict_of) {
var original = this.modelManager.findItem(item.conflict_of);
// check if item contents are equal. If so, automatically delete conflict
if(JSON.stringify(item.structureParams()) === JSON.stringify(original.structureParams())) {
this.modelManager.setItemToBeDeleted(item);
needsSync = true;
}
}
}
if(needsSync) {
setTimeout(function () {
this.sync();
}.bind(this), 100);
}
}
clearSyncToken() { clearSyncToken() {
localStorage.removeItem("syncToken"); localStorage.removeItem("syncToken");
} }