sync problem

RomanP

Sometimes, I write on the PC app while my phone is offline (text1), then I go for a walk and write offline on the Android app on my phone (text2). When I return home, turn on Wi-Fi, and open the Diaro app on my phone, it syncs, but text2 disappears and only text1 remains.

timo

This isn't the Diaro app, are you mixing up apps? 😃

When there is text added to the same entry, without a sync happening inbetween, the app is confronted with a conflict that cannot be easily resolved. Apps like OneNote are facing similar challenges. So the app choses the longer entry text, this is the currently expected behavior

RomanP

Typing mistake. 🙂
Thank you for the answer.

timo

I have thought more about this and was able to find an algorithm to merge two pieces of entry texts in cases when Diarium performs a database merge. It can lead to duplications if text is moved around or changed independently on multiple devices, but that's probably better than throwing away stuff.

AvinashR

timo but that's probably better than throwing away stuff.

Maybe you also add TAG called duplicate so that we know there are duplicate entries
But not sure which one should be marked as duplicate. May be second one based on entry modified date.

RomanP

Thank you very much. It helps a lot

timo

AvinashR The entry isn't duplicated. There is one entry, but the text of it contains the merge result of the two source texts