A fully open source & end-to-end encrypted note taking alternative to Evernote.
TypeScript asp-net-coredotnet-coreelectronfosshacktoberfestnote-managmentnote-takingnote-taking-appnotebooknotesnotes-appopen-sourceopensourceprivacyproductivityreactreact-nativereactjsself-hosted
core: only delete attachment file (not the metadata) on sync conflict
Abdullah Atta523da4e91ff7
diff --git a/packages/core/src/api/sync/merger.ts b/packages/core/src/api/sync/merger.tsindex 2e2262421..bd4211a59 100644--- a/packages/core/src/api/sync/merger.ts+++ b/packages/core/src/api/sync/merger.ts@@ -93,14 +93,18 @@ class Merger {isDeleted(localItem) ||isDeleted(remoteItem) ||!localItem.dateUploaded ||- !remoteItem.dateUploaded+ !remoteItem.dateUploaded ||+ localItem.dateUploaded === remoteItem.dateUploaded) {return this.mergeItem(remoteItem, localItem);}if (localItem.dateUploaded > remoteItem.dateUploaded) return;- const isRemoved = await this.db.attachments.remove(localItem.hash, true);+ logger.debug("Removing local attachment file due to conflict", {+ hash: localItem.hash+ });+ const isRemoved = await this.db.fs().deleteFile(localItem.hash, true);if (!isRemoved)throw new Error("Conflict could not be resolved in one of the attachments."