Fix conflicts for offline uploads when uploading same file again

[daniele-verducci]

Fixes the following two problems:

Conflict message being shown for offline uploads when the offline-uploaded file is the same as the remote

Fixes the conflict message being shown for offline uploads when the offline-uploaded file is the same as the remote. This makes the behavior aligned with what happens online.

How to repro:

• Create a folder
• Upload a file
• Go offline (e.g. airplane mode)
• Upload a second time the same, unmodified file
• Go online
• A conflict message is shown

Now execute the same actions in a new folder without going offline:

• A conflict message is NOT shown

This is because the offline upload erases the etag_on_server field for the already existing db entry.
This PR fixes this issue.

Remote file overwritted by local file when selecting "keep both" after offline upload

This PR does fix this this second issue: #17589

How to repro:

• Create a folder
• Upload a file
• Go offline (e.g. airplane mode)
• Upload a second time the same, unmodified file
• Go online
• A conflict notification is shown
• Click resolve, note the dialog: it says folder conflict, and the dates and sizes are wrong
• Select both versions and click ok
• Notice the remote version is overwritten by the local one. At the end you are left with a single file in the folder instead of two.

🏁 Checklist

• ⛑️ Tests (unit and/or integration) are included or not needed
• 🔙 Backport requests are created or not needed: /backport to stable-xx.x
• 📅 Milestone is set
• 🌸 PR title is meaningful (if it should be in the changelog: is it meaningful to users?)

🤖 AI (if applicable)

• The content of this PR was partly or fully generated using AI (N/A)

[daniele-verducci]

@tobiasKaminsky should this be in milestone 35 or 36?

[github-actions]

APK file: https://github.com/nextcloud/android/actions/runs/34251212640/artifacts/10066358893
To test this change/fix you can simply download above APK file and install and test it in parallel to your existing Nextcloud app.
(please click on link to get QR code displayed)

[daniele-verducci]

Hey @alperozturk96 , as anticipated I fixed also the missing case, so I re-requested your review. You can check just the last 4 (new) commits.
Basically, before the last 3 commits :

• Create a folder
• Upload a file
• Go offline (e.g. airplane mode)
• Upload a second time the same, unmodified file
• Go online
• A conflict notification is shown
• Click resolve, note the dialog: it says folder conflict, and the dates and sizes are wrong
• Select both versions and click ok
• Notice the remote version is overwritten by the local one. At the end you are left with a single file in the folder instead of two.

So, the last commits fixes the dialog content and the overwrite. If approved, will close #17589 .

Thank you!

[alperozturk96]

/backport to stable-35.0.x

[github-actions]

blue-Light-Screenshot test failed, but no output was generated. Maybe a preliminary stage failed.

[github-actions]

APK file: https://github.com/nextcloud/android/actions/runs/34466906550/artifacts/10150066862
To test this change/fix you can simply download above APK file and install and test it in parallel to your existing Nextcloud app.
(please click on link to get QR code displayed)

[alperozturk96]

private fun updateOperationPath(newPath: String, nextOperation: OfflineOperationEntity): OfflineOperationEntity? {
        if (newPath == nextOperation.path) return null

        val updatedType = when (val currentType = nextOperation.type) {
            is OfflineOperationType.CreateFile -> currentType.copy(remotePath = newPath)
            is OfflineOperationType.CreateFolder -> currentType.copy(path = newPath)
            else -> currentType
        }

        return nextOperation.apply {
            type = updatedType
            path = newPath
        }
    }

[alperozturk96]

Just a tiny thing :) No need to have another comment since we have Log_OC.i. You can update it to cover both.

[alperozturk96]

Good improvement with getNewAvailableRemotePath.

moveLocalFile was unnecessary here since file is already there.

[codecov]

Codecov Report

❌ Patch coverage is 2.85714% with 68 lines in your changes missing coverage. Please review.

Files with missing lines	Patch %	Lines
...a/com/nextcloud/utils/extensions/FileExtensions.kt	0.00%	20 Missing ⚠️
...erations/repository/OfflineOperationsRepository.kt	0.00%	18 Missing ⚠️
...loud/android/datamodel/FileDataStorageManager.java	7.69%	12 Missing ⚠️
...ui/dialog/conflict/ConflictResolveDialogFactory.kt	0.00%	11 Missing ⚠️
...ud/android/ui/activity/ConflictsResolveActivity.kt	0.00%	7 Missing ⚠️

📢 Thoughts on this report? Let us know!

[github-actions]

📱 QA build

Download	app-qa-debug.apk (76M)
QR code	Open the QR code for this download
Commit	e82ac43
Version	17590
Available until	7 days after this build

The QA build installs alongside a released Nextcloud app, so you can keep
using your existing install while testing.

Downloading the file requires a GitHub account, so open this link on the
device you want to test on, or transfer the APK to it.

[github-actions]

Codacy

SpotBugs

Category	Base	New
Bad practice	32	32
Correctness	58	58
Dodgy code	186	186
Experimental	1	1
Malicious code vulnerability	2	2
Multithreaded correctness	26	26
Performance	37	37
Security	19	19
Total	361	361