Could DAVdroid introduce a workaround for this case? Somewhere in DAVDroid, there must be a place where local and remote contacts get compared. In that place, one could possibly check for these three things:
- How many changes are there overall?
- If there’s exactly one change
- AND that change is to the local VCard
- AND that change happens to be
then, we just discard this?
I have no Idea if this opens up a huge can of worms, but If (as you suggest) this will remain in all of android 7, then we’re stuck with this behaviour for the next few years. With the vast majority of people getting to 7 this or next year. And then dragging this bug around for 3-4 years to come until android 8 is widely available.