Automatic photo upload conflicts are never resolved
- Dominant language
- Kotlin
- Stars
- 5.6k
- Forks
- 2k
- Avg merge
- 2d 18h
- Merged PRs (30d)
- 92
Description
- [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. enable auto upload for photos for your camera folder
2. check Android notifications from Nextcloud
3. Go to sync conflict. Find files where identical copies are already on server.
4. Resolve a dozen or so of the conflicts the same way (e.g. file is already on server > keep server copy).
5. Manually resolved conflicts do not disappear from list (or sometimes, they do, randomly)
6. refresh the upload list and go to failed upload /sync conflicts section
7. The same files that you just resolved conflicts for are in the failed list again.
### Expected behaviour
1. When identical copies are found on both client and server, the upload should be skipped instead of giving a conflict notification (afaik, [that would be the implemented behavior](https://github.com/nextcloud/android/issues/11974#issuecomment-1913137710))
2. Upload of other files should not be stopped when sync conflicts occur.
3. If a conflict notification is given, and the user resolves it manually, that conflict should disappear from the list.
4. The file for which handling was manually set should not come up as sync conflict again.
### Actual behaviour
1. > size, creation and modification date of the remote and local file are the same,
but upload is not skipped. Instead, a sync conflict notification is created
2. The upload cue is halted until conflicts are manually resolved (_sometimes_, after resolving a number of conflicts, upload of waiting files is resumed though)
3. conflicts that were just resolved do not disappear from the list
4. After resolving the conflict the same file comes up as sync conflict again.
### Android version
11
### Device brand and model
Nokia 7.2
### Stock or custom OS?
Stock
### Nextcloud android app version
3.29.1
### Nextcloud server version
27.1.4
### Using a reverse proxy?
No
### Android logs
The adb isn't working with this phone, see here:
~$ adb logcat --pid=$(adb shell pidof -s 'com.nextcloud.client') > logcatOutput.txt
* daemon not running; starting now at tcp:5037
ADB server didn't ACK
Full server startup log: /tmp/adb.1000.log
Server had pid: 24103
--- adb starting (pid 24103) ---
08-07 00:30:39.348 24103 24103 I adb : main.cpp:63 Android Debug Bridge version 1.0.41
08-07 00:30:39.348 24103 24103 I adb : main.cpp:63 Version 35.0.1-android-tools
08-07 00:30:39.348 24103 24103 I adb : main.cpp:63 Installed as /usr/bin/adb
08-07 00:30:39.348 24103 24103 I adb : main.cpp:63 Running on Linux 6.9.12-200.fc40.x86_64 (x86_64)
08-07 00:30:39.348 24103 24103 I adb : main.cpp:63
08-07 00:30:39.355 24103 24103 I adb : auth.cpp:416 adb_auth_init...
08-07 00:30:39.356 24103 24103 I adb : auth.cpp:152 loaded new key from '/home/ben/.android/adbkey' with fingerprint C4CFE0C93C9CF7F5BCE0B493AED4776486423660F9F7847F490F95E452BDC847
08-07 00:30:39.356 24103 24103 I adb : auth.cpp:391 adb_auth_inotify_init...
08-07 00:30:40.356 24103 24103 E adb : usb_libusb.cpp:571 failed to open device: Access denied (insufficient permissions)
08-07 00:30:40.356 24103 24103 I adb : transport.cpp:1150 D0AA002184J92170360: connection terminated: failed to open device: Access denied (insufficient permissions)
adb: io.c:1493: libusb_submit_transfer: Assertion `transfer->dev_handle' failed.
* failed to start daemon
adb: cannot connect to daemon
* daemon not running; starting now at tcp:5037
ADB server didn't ACK
Full server startup log: /tmp/adb.1000.log
Server had pid: 24120
--- adb starting (pid 24120) ---
08-07 00:30:40.599 24120 24120 I adb : main.cpp:63 Android Debug Bridge version 1.0.41
08-07 00:30:40.599 24120 24120 I adb : main.cpp:63 Version 35.0.1-android-tools
08-07 00:30:40.599 24120 24120 I adb : main.cpp:63 Installed as /usr/bin/adb
08-07 00:30:40.599 24120 24120 I adb : main.cpp:63 Running on Linux 6.9.12-200.fc40.x86_64 (x86_64)
08-07 00:30:40.599 24120 24120 I adb : main.cpp:63
08-07 00:30:40.604 24120 24120 I adb : auth.cpp:416 adb_auth_init...
08-07 00:30:40.604 24120 24120 I adb : auth.cpp:152 loaded new key from '/home/ben/.android/adbkey' with fingerprint C4CFE0C93C9CF7F5BCE0B493AED4776486423660F9F7847F490F95E452BDC847
08-07 00:30:40.604 24120 24120 I adb : auth.cpp:391 adb_auth_inotify_init...
08-07 00:30:41.605 24120 24120 E adb : usb_libusb.cpp:571 failed to open device: Access denied (insufficient permissions)
08-07 00:30:41.605 24120 24120 I adb : transport.cpp:1150 D0AA002184J92170360: connection terminated: failed to open device: Access denied (insufficient permissions)
adb: io.c:1493: libusb_submit_transfer: Assertion `transfer->dev_handle' failed.
* failed to start daemon
- waiting for device -
error: cannot connect to daemon
### Server error logs
```bash
[PHP] Fehler: file_exists(): open_basedir restriction in effect. File(/usr/local/bin/7za) is not within the allowed path(s): (/home/sites/site100011358/:/tmp/:/dev/:/usr/share/php/:/etc/ssl/certs/:/usr/lib64/php8.1/bin/) at /home/sites/site100011358/web/nextcloud/apps/files_archive/vendor/gemorroj/archive7z/src/Archive7zTrait.php#36
GET /index.php/apps/files/
from 77.118.249.205 by bennypr0fane at 2024-08-06T22:33:56+00:00
```
### Additional information
_No response_
Contributor guide
Assessment
This issue has not been assessed yet.