nextcloud / nextcloud/android

Decision for server version during conflic resolution is not respected

Open
#11,587 0 comments 1 reaction 0 assignees View on GitHub
bug feature: transfers hotspot: sync conflicts stable-3.24
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. Create some conflicting files between server and mobile
2. Go to the upload file list and see the conflicting file
3. Tap on resolve conflict
4. Choose server version and press okay (or whatever the confirmation button is called)
5. Eventually wait a few seconds in the upload list

### Expected behaviour

The conflict should be resolved. Either the server version of the file should be downloaded (most probably the simplest and cleanest solution, with or without backup of local version) or the conflicting file should be somehow ignored.

### Actual behaviour

The conflicting file is almost instantaneously reported as another conflict (again). You cannot keep the server version. You can either keep both versions or you can *remove* the conflict manually. This is rather counter-intuitive and error-prone.

### Android version

10

### Device brand and model

Dogee S96Pro

### Stock or custom OS?

Stock

### Nextcloud android app version

3.24.2 (also in previous versions this happened)

### Nextcloud server version

23.0.2

### Using a reverse proxy?

Yes

### Android logs

_No response_

### Server error logs

_No response_

### Additional information

Currently, I have no conflicting file to create a log file.

This happens in my case typically with automatic uploads of images/videos taken on the mobile. Also, I think this is triggered if the file on the mobile phone changes (the files are corrupted from time to time, this is why I want to save them). I cannot "trigger" corruption of files.

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.