Error resolving conflict: not shown correctly when app protection is enabled

[styx-tdo]

Steps to reproduce

1. create a conflict
2. click on notification "File upload conflict"

Expected behaviour

.... conflict dialogue

Actual behaviour

get toast: Error creating conflict dialogue!

Can you reproduce this problem on https://try.nextcloud.com?

• Please create a test demo account and see if this still happens there.
• If yes, please open up a bug report
• If not, please verify server setup and ask for help on forum

Environment data

Android version: 9 Device model: BV9900Pro

Stock or customized system: stock

Nextcloud app version: 3.13.1

Nextcloud server version: 18

Reverse proxy: N/A

Logs

Web server error log

N/A

[nursoda]

Same here. Conflict dialog is not shown after tapping the notification. Instead, the error "Error creating conflict dialogue!" is shown (as toast). Device OnePlus 6T, Android 10, NC Android App 3.13.1.

Yet, some version ago it WAS shown but either choice led to the conflict not being resolved and the dialog being displayed again. For that (other) issue, see https://github.com/nextcloud/android/issues/6963

[tobiasKaminsky]

Do you have any idea what kind of conflict file this is?

[styx-tdo]

File being updated on server and client.. that this is weird for a photo folder is a question for another ticket, though.

[nursoda]

Do you have any idea what kind of conflict file this is?

In my case this happens when AutoUpload is set to COPY immediately via Wifi (don't delete locally) and I edit (crop most of the time) the image (e.g. screenshot).

[tobiasKaminsky]

Can you test #7102 ?

[stale[bot]]

This bug report did not receive an update in the last 4 weeks. Please take a look again and update the issue with new details, otherwise the issue will be automatically closed in 2 weeks. Thank you!

[giox069]

Same problem here, with latest version (3.14.1) available on playstore of Nextcloud client for android. Phone is Huawei P10 Lite. It started some months ago: suddenly a lot of conflicts started to appear on the InstantUpload Camera folder for no reason. But it's impossible to open the conflict dialog/window from the system notification:

[nursoda]

Sorry, I was/am busy. Just hit the part of the error again I think. I'm on a OnePlus 6T using NC app 3.14.1 (Google Play Beta Channel) on Android 10 against NC 20.0.2. Actions to reproduce:

• set NC app to auto-upload screenshots (if resticted to only-when-charging, then plug-in cable) and to require "device credentials" ("Geräte-Anmeldedaten") to open it
• take a screenshot (I use two-button-press hotkey set in my phone settings)
• Note: On my phone, newly taken screenshots are displayed on the lower right display corner with advanced features such as "exteded screenshot" (scrolls current page down to its end and captures all of it). There, I select "edit" to crop the image (in order to share the cropped in an IM).
• edit the just-take screenshot right away (in my case crop). I see that the Nextcloud upload of the original screenshot starts in mobile phones top status bar while cropping it. Save the cropped screenshot. It's saved to the SAME filename obviously, which is intended/expected behaviour since I decided to crop it "in-place" using the above mentioned phone's feature.
• after saving, I get an NC app conflict notification. When I tap it, the NC app opens (and asks for my fingerprint) along with a toast that the "conflict dialog" could not be "created" ("Konfiktdialog konnte nicht erstellt werden" on my german phone) – and the notification disappears
• I open the NC app and head via menu to "Uploads" section. There, on the picture previews I see that the uncropped file was uploaded fine, and that the modified file is an unresolved conflict.
• tapping the conflict yields the conflict dialog (that should have displayed in the first place, so maybe it's a "dialog cannot be opened via toast when NC app access protection is enabled" issue?
• I select "new file" and "OK". The new file is uploaded and replaces the original file, so THAT part of the bug IS solved.

[github-actions[bot]]

This bug report did not receive an update in the last 4 weeks. Please take a look again and update the issue with new details, otherwise the issue will be automatically closed in 2 weeks. Thank you!

[nursoda]

I don't think there is anything I could do better here since the test request above is obsolete since the subsequent reports are based on a client that already had the improvements merged.

[tobiasKaminsky]

Can you test again with app protection disabled?

[nursoda]

Completely without app protection, and with PIN, I always get the proper conflict dialog and file handling. With app protection, it depends on timing and whether the app is open before tapping the conflict notification:

• very quick edits → edited file is uploaded right away
• medium speed → typically one conflict dialog, but I managed to get two: first was cropped+full shot, second was zero-byte+cropped shot :/

Steps to reproduce:

• set app to app protection, close app, remove app from recent apps
• take shot, crop it right away while it gets uploaded, conflict notification appears
• don't tap notification yet, open NC app, unlock protection, tap notification
• dialog is displayed properly, cropped shot is uploaded and replaces full shot

So, yes, perfect like that … except that the preview pic NC app shows doesn't match cropped but full shot.

Here's a screenshot taken after removing protection to show the zero byte case (in uploads history):

[detrout]

I am experiencing this problem (or at least one very similar).

I had used auto upload to upload a bunch of images from my phone to nextcloud, but left them on my phone. Later I decided to change my nextcloud site name from something like example.org/nextcloud to nextcloud.example.org which seemed to require that I delete and recreate my account.

I recreated my account and turned instant upload on and the android client attempted to reupload all 700ish files. I unfortunately didn't pick a default of assume server side is correct so it want's to ask which version to keep.

However when I click on the "File upload conflict" notification I get "Error creating conflict dialog"

I'm on a Galaxy S9 SM-G960U1, using Android 10 build QP1A.190711.020.G960U1UES9FUC1 with SE Enforcing on.

I'm using Nextcloud from f-droid version 3.14.1

Also I think something about managing the notification window with the 700ish photos is causing a power drain as after I turned this on my battery life seems to have declined.

[detrout]

I was finally able to find how get to the conflict resolution dialog. I had to go to uploads in the nextcloud app and in there if I tapped a photo the dialog would pop up. I canceled the pending uploads first, before changing the state, but I'm not sure if that's necessary.

[cnmicha]

Potential duplicate of #6027

[strk]

Same problem here now. Model: moto g¹⁰ (XT2127-2) Android 11 build number RRBS31.Q1-3-48-22 App version: 3.29.0

I confirm @detrout workaround works: https://github.com/nextcloud/android/issues/7000#issuecomment-833717522

[Aniganesh]

I'm having the same issue. App protection is disabled. In my case the conflicts are happening because I reinstalled Nextcloud and restored the db and files backup from my previous installation. I have over a thousand conflicts and none of them are able to be resolved. Is there a way to resolve the conflicts on the web app?