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

fix merge conflict resolution

Browse Source
This commit is contained in:
ammarahm-ed
2021-12-31 11:05:42 +05:00
parent 5ea20eaf65
commit 7cfdfcf458
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
apps/mobile/src/components/MergeEditor/index.js
View File

@@ -16,7 +16,6 @@ import Navigation from '../../services/Navigation';
import Sync from '../../services/Sync'; import Sync from '../../services/Sync';
import {dHeight} from '../../utils'; import {dHeight} from '../../utils';
import {db} from '../../utils/database'; import {db} from '../../utils/database';
import diff from '../../utils/differ';
import { import {
eApplyChanges, eApplyChanges,
eShowMergeDialog, eShowMergeDialog,
@@ -131,16 +130,20 @@ const MergeEditor = () => {
: null; : null;
await db.notes.add({ await db.notes.add({
content: { id: note.id,
conflicted: false,
dateEdited: content.dateEdited
});
await db.content.add({
id: note.contentId,
data: content.data, data: content.data,
type: content.type, type: content.type,
dateEdited: content.dateEdited, dateResolved: secondaryData.dateModified,
remote: true, sessionId: Date.now(),
dateResolved: secondaryData.dateEdited
},
id: note.id,
conflicted: false conflicted: false
}); });
if (keepCopy) { if (keepCopy) {
await db.notes.add({ await db.notes.add({
content: { content: {
@@ -220,7 +223,6 @@ const MergeEditor = () => {
}; };
const close = () => { const close = () => {
db.fs.cancel(primaryData?.noteId); db.fs.cancel(primaryData?.noteId);
EV.unsubscribe(EVENTS.mediaAttachmentDownloaded, onMediaLoaded); EV.unsubscribe(EVENTS.mediaAttachmentDownloaded, onMediaLoaded);