Conflict Resolve Dialog Shows Incorrect Thumbnail and File List Does Not Reflect Selected Local File

[alperozturk96]

⚠️ Before posting ⚠️

• This is a bug, not a question or an enhancement.
• I've searched for similar issues and didn't find a duplicate.
• I've written a clear and descriptive title for this issue, not just "Bug" or "Crash".
• I agree to follow Nextcloud's Code of Conduct.

Steps to reproduce

1. Trigger a file conflict scenario (e.g., uploading a file that already exists remotely).
2. Observe the file conflict dialog — the thumbnail preview shown is incorrect or mismatched.
3. Select the local file option to resolve the conflict.
4. Navigate back to the file list view.
5. Repeat same scenario and again select the local file
6. File list not displays correct item.

Expected behaviour

The file conflict dialog should display the correct thumbnail preview for both local and remote files.

Upon selecting the local file, the file list should update correctly.

Actual behaviour

The file conflict dialog shows an incorrect thumbnail.

After selecting the local file, the corresponding file is not correctly updated in the file list.

Android version

15

Device brand and model

Android Emulator

Stock or custom OS?

Stock

Nextcloud android app version

3.31.0

Nextcloud server version

31.0.0

Using a reverse proxy?

I don't know

Android logs

No response

Server error logs

Additional information

No response

[alperozturk96]

When a file conflict occurs and the user opens the Conflict Resolution Dialog, thumbnails are initially displayed correctly. However, it's only for the first time.

If the user chooses to replace the existing remote file with a newly selected local file, the upload operation fails with an Unrecovered transport exception.

E  Upload of /storage/emulated/0/Download/Duplicate/0008.webp to /abc/0008.webp: Unrecovered transport exception
   org.apache.commons.httpclient.NoHttpResponseException: The server 10.0.2.2 failed to respond
       at org.apache.commons.httpclient.HttpMethodBase.readStatusLine(HttpMethodBase.java:1976)
       at org.apache.commons.httpclient.HttpMethodBase.readResponse(HttpMethodBase.java:1735)
       at org.apache.commons.httpclient.HttpMethodBase.execute(HttpMethodBase.java:1098)
       at org.apache.commons.httpclient.HttpMethodDirector.executeWithRetry(HttpMethodDirector.java:398)
       at org.apache.commons.httpclient.HttpMethodDirector.executeMethod(HttpMethodDirector.java:171)
       at org.apache.commons.httpclient.HttpClient.executeMethod(HttpClient.java:397)
       at org.apache.commons.httpclient.HttpClient.executeMethod(HttpClient.java:323)
       at com.owncloud.android.lib.common.OwnCloudClient.executeMethod(OwnCloudClient.java:192)
       at com.owncloud.android.lib.resources.files.UploadFileRemoteOperation.uploadFile(UploadFileRemoteOperation.java:214)
       at com.owncloud.android.lib.resources.files.UploadFileRemoteOperation.run(UploadFileRemoteOperation.java:162)
       at com.owncloud.android.lib.common.operations.RemoteOperation.execute(RemoteOperation.java:193)
       at com.owncloud.android.operations.UploadFileOperation.normalUpload(UploadFileOperation.java:1055)
       at com.owncloud.android.operations.UploadFileOperation.run(UploadFileOperation.java:451)
       at com.owncloud.android.lib.common.operations.RemoteOperation.execute(RemoteOperation.java:193)
       at com.nextcloud.client.jobs.upload.FileUploadWorker.upload(FileUploadWorker.kt:263)
       at com.nextcloud.client.jobs.upload.FileUploadWorker.uploadFiles(FileUploadWorker.kt:213)
       at com.nextcloud.client.jobs.upload.FileUploadWorker.retrievePagesBySortingUploadsByID(FileUploadWorker.kt:156)
       at com.nextcloud.client.jobs.upload.FileUploadWorker.doWork(FileUploadWorker.kt:101)
       at androidx.work.Worker$startWork$1.invoke(Worker.kt:64)
       at androidx.work.Worker$startWork$1.invoke(Worker.kt:64)
       at androidx.work.WorkerKt.future$lambda$2$lambda$1(Worker.kt:100)
       at androidx.work.WorkerKt.$r8$lambda$06LNzu7McnKR6G06fSbfQ2BCegc(Unknown Source:0)
       at androidx.work.WorkerKt$$ExternalSyntheticLambda1.run(D8$$SyntheticClass:0)
       at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145)
       at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:644)
       at java.lang.Thread.run(Thread.java:1012)