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

fix: get remoteItem id from decrypted data

Browse Source
This commit is contained in:
thecodrr
2022-01-12 23:51:21 +05:00
parent e54a5e8ef0
commit 23fac959f4
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -46,8 +46,9 @@ class Merger {
}
async _mergeItem(remoteItem, get, add) {
let localItem = await get(remoteItem.id);
remoteItem = await this._deserialize(remoteItem);
let localItem = await get(remoteItem.id);
if (!localItem || remoteItem.dateModified > localItem.dateModified) {
await add(remoteItem);
}
@@ -61,8 +62,8 @@ class Merger {
}
async _mergeItemWithConflicts(remoteItem, get, add, markAsConflicted) {
let localItem = await get(remoteItem.id);
remoteItem = await this._deserialize(remoteItem);
let localItem = await get(remoteItem.id);
if (!localItem) {
await add(remoteItem);