Mirrors/notesnook
1
0
Fork 0
mirror of https://github.com/streetwriters/notesnook.git synced 2025-12-23 23:19:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: check and handle undefined data during sync merge

Browse Source
This commit is contained in:
thecodrr
2021-06-03 09:18:18 +05:00
parent 25c08198fb
commit 3a5fd2ea65
1 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
packages/core/api/sync/merger.js
View File

@@ -76,15 +76,8 @@ class Merger {
async merge(serverResponse, lastSynced) {
if (!serverResponse) return false;
this._lastSynced = lastSynced;
const {
notes,
synced,
notebooks,
content,
trash,
vaultKey,
settings,
} = serverResponse;
const { notes, synced, notebooks, content, trash, vaultKey, settings } =
serverResponse;
if (synced || areAllEmpty(serverResponse)) return false;
this.key = await this._db.user.getEncryptionKey();
@@ -118,16 +111,19 @@ class Merger {
async (local, remote) => {
// if hashes are equal do nothing
if (
!remote ||
!local ||
!remote.data ||
remote.data === "undefined" || //TODO not sure about this
SparkMD5.hash(local.data) === SparkMD5.hash(remote.data)
)
return;
// merge conflicts resolver
const note = this._db.notes.note(local.noteId).data;
let note = this._db.notes.note(local.noteId);
if (!note || !note.data) return;
note = note.data;
if (local.deleted || note.locked) {
if (remote.deleted || local.deleted || note.locked) {
// if note is locked or content is deleted we keep the most recent version.
if (remote.dateEdited > local.dateEdited)
await this._db.content.add({ id: local.id, ...remote });