fix: conflict resolve activity

[alperozturk96]

• [x] Tests written, or not not needed

Fixes

Fixes existingFile initialization previously, EXTRA_EXISTING_FILE was never set, causing existingFile to always have a file ID of -1L. With this PR, existingFile is properly initialized, ensuring correct file references throughout the flow.

Removes newFile to simplify logic, the newFile variable was misleading, it actually referred to a file from FileActivity. File refers to the newly selected file from local storage.

Fixes keepLocal behavior. keepLocal must just do, removes the existing remote file and uploads the newly selected local file. Thus, thumbnail and preview of the new file will appear correctly.

[github-actions[bot]]

test-Unit test failed: https://www.kaminsky.me/nc-dev/android-integrationTests/15983-Unit-test-10-28

[github-actions[bot]]

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

[github-actions[bot]]

APK file: https://www.kaminsky.me/nc-dev/android-artifacts/15983.apk



To test this change/fix you can simply download above APK file and install and test it in parallel to your existing Nextcloud app.

[github-actions[bot]]

Codacy

SpotBugs

Category	Base	New
Bad practice	42	42
Correctness	73	73
Dodgy code	272	272
Experimental	1	1
Internationalization	7	7
Malicious code vulnerability	2	2
Multithreaded correctness	35	35
Performance	48	48
Security	18	18
Total	498	498