File not found on local filesystem -> Conflict resolved #17019

⚠️ Before posting ⚠️

• This is a bug, not a question or an enhancement.
• I've searched for similar issues and didn't find a duplicate.
• I've written a clear and descriptive title for this issue, not just "Bug" or "Crash".
• I agree to follow Nextcloud's Code of Conduct.

Steps to reproduce

Not entirely sure, TBH.

The problem is that after the excellent work in #16819 to resolve #16818, there is still a strange occurrence.

I was able to quickly (and without having to choose server/local file over and over again -- yay!) resolve a slew of conflicts. But I am left with 7 that don't seem to want to resolve. Or rather, they say they are resolved but do not disappear from the list. In all of these 7, I press on them to resolve the conflict and I get a toast message saying File not found on local filesystem which is very quickly replaced with another toast message: Conflict resolved but the conflict remains in the list.

It is interesting that there is even a conflict registered for a file that exists neither on the local device nor remotely on Nextcloud.

Expected behaviour

If a conflict is resolved, it should be removed from the list.

But more importantly, why are conflicts even being created for files that exist in neither location.

Actual behaviour

Conflict continues to remain in conflict list.

Android version

16

Device brand and model

Pixel 8 Pro

Stock or custom OS?

Stock

Nextcloud android app version

33.1.0

Nextcloud server version

31.0.9

Using a reverse proxy?

No

Android logs

No response

Server error logs

Additional information

No response