fix(conflict-resolve) check#17302
Conversation
|
APK file: https://github.com/nextcloud/android/actions/runs/28873642851/artifacts/8142093477 |
Signed-off-by: alperozturk96 <alper_ozturk@proton.me>
Signed-off-by: alperozturk96 <alper_ozturk@proton.me> # Conflicts: # app/schemas/com.nextcloud.client.database.NextcloudDatabase/101.json # app/src/main/java/com/nextcloud/client/database/NextcloudDatabase.kt
1a5365d to
7e57102
Compare
|
blue-Light-Screenshot test failed, but no output was generated. Maybe a preliminary stage failed. |
| return false | ||
| } | ||
|
|
||
| private fun isETagUnchangedSinceLastUpload(remoteFile: RemoteFile, localPath: String, remotePath: String): Boolean { |
There was a problem hiding this comment.
isSameFileOnRemote collision check relied only on RemoteFile.isSame() (size + creation/modification timestamps + image dimensions), which is not reliable.
I added an etag column to OCUpload, written once at upload success UploadFileOperation copies file.getEtag() from the post-upload and never mutated afterward.
The etag of the OCFile is not stable it is always mutated from somewhere else and causing issue to compare.
For example A.jpg uploaded before I must have eTag and eTagOnServer value but when I check database eTag field is empty. I need simple comparison eTag is changed or not.
|
APK file: https://github.com/nextcloud/android/actions/runs/29413156394/artifacts/8344807494 |
|
master-IT test failed: https://www.kaminsky.me/nc-dev/android-integrationTests/17302-IT-master-14-33 |
tobiasKaminsky
left a comment
tobiasKaminsky
left a comment
There was a problem hiding this comment.
Let us first try to find out why etag on ocfile is empty.
2 participants
Issue
Successful file uploads was showing conflict resolution notification.
How to reproduce?
Changes
isSameFileOnRemoteOCUploadfor eTag comparison against newly fetchedRemoteFile.OCFilecannot be used because eTag field ofOCFilenot consistent and gets updated from multiple places. eTag ofOCUploadonly gets updated from one place.