nextcloud / nextcloud/android

Conflict resolving in the app stops working if conflict is resolved externally

Open
#11,903 0 comments 0 reactions 0 assignees View on GitHub
bug feature: auto upload feature: transfers hotspot: sync conflicts
Dominant language
Kotlin
Stars
5.6k
Forks
2k
Avg merge
2d 18h
Merged PRs (30d)
92

Description

### ⚠️ Before posting ⚠️

- [X] This is a **bug**, not a question or an enhancement.
- [X] I've [searched for similar issues](https://github.com/nextcloud/android/issues) and didn't find a duplicate.
- [X] I've written a clear and descriptive title for this issue, not just "Bug" or "Crash".
- [X] I agree to follow Nextcloud's [Code of Conduct](https://nextcloud.com/contribute/code-of-conduct/).

### Steps to reproduce

1. have auto-upload enabled and take a photo
2. upload starts
3. receive (erroneous) file conflict (that is another issue; e.g. #10628, #6938, #7944, ...)
4. resolve problem outside of the app (e.g. via web interface move or delete the file that is being reported as conflicting)
5. click on `resolve conflict` in the app

### Expected behaviour

either that:
- (ideally) the app detects that there is no conflict anymore, and uploads file automatically,
- or at least that app shows dialog asking user whether they want to `Local file / Server file` as it was doing before (even though `server file` is no longer there)

### Actual behaviour

No dialog is presented, and no upload happens, instead (after very briefly showing `Fetching server version...` message) control just returns to the app without having done anything. It is no longer possible to upload that image to the server, only have it being deleted.

https://github.com/nextcloud/android/assets/156656/b70a089a-7688-4c66-adc0-824675da89c7

### Android version

Android 10 (EMUI 12.0.0)

### Device brand and model

Huawei P30Pro

### Stock or custom OS?

Stock

### Nextcloud android app version

3.25.0 (f-droid)

### Nextcloud server version

Nextcloud Hub 3 (25.0.9)

### Using a reverse proxy?

No

### Android logs

[logcatOutput.txt](https://github.com/nextcloud/android/files/12353137/logcatOutput.txt)

### Server error logs

_No response_

### Additional information

_No response_

Contributor guide

Open the contributing guide

Assessment

This issue has not been assessed yet.

Get new issues in your inbox

A short digest of beginner-friendly GitHub issues.