Improvements in sync conflict resolution

[AlvaroBrey]

Rebased and fixed version of #9036

Fixes #7905

Thanks @wknds

• Tests written, or not not needed

[AlvaroBrey]

/rebase

[AlvaroBrey]

/rebase

[AlvaroBrey]

/rebase

[AlvaroBrey]

/rebase

[github-actions]

APK file: https://www.kaminsky.me/nc-dev/android-artifacts/9691.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.

[nextcloud-android-bot]

Codacy

Lint

Type	master	PR
Warnings	124	124
Errors	0	0

SpotBugs (new)

Warning Type	Number
Bad practice Warnings	28
Correctness Warnings	82
Experimental Warnings	1
Internationalization Warnings	9
Malicious code vulnerability Warnings	57
Multithreaded correctness Warnings	9
Performance Warnings	69
Security Warnings	29
Dodgy code Warnings	358
Total	642

SpotBugs (master)

Warning Type	Number
Bad practice Warnings	28
Correctness Warnings	82
Experimental Warnings	1
Internationalization Warnings	9
Malicious code vulnerability Warnings	57
Multithreaded correctness Warnings	9
Performance Warnings	69
Security Warnings	29
Dodgy code Warnings	358
Total	642

[codecov]

Codecov Report

Merging #9691 (c5b75f6) into master (fd22f9f) will decrease coverage by 0.39%.
The diff coverage is 16.00%.

@@            Coverage Diff             @@
##           master    #9691      +/-   ##
==========================================
- Coverage   31.52%   31.13%   -0.40%     
==========================================
  Files         505      505              
  Lines       38573    38581       +8     
  Branches     5382     5382              
==========================================
- Hits        12160    12012     -148     
- Misses      24604    24761     +157     
+ Partials     1809     1808       -1     

Impacted Files	Coverage Δ
...wncloud/android/files/services/FileDownloader.java	16.49% <0.00%> (ø)
...loud/android/ui/activities/ActivitiesActivity.java	0.00% <0.00%> (ø)
.../android/ui/activity/ConflictsResolveActivity.java	24.48% <0.00%> (-0.52%)	⬇️
.../java/com/owncloud/android/utils/DisplayUtils.java	31.87% <28.57%> (-0.26%)	⬇️
...ava/com/owncloud/android/files/FileMenuFilter.java	51.45% <0.00%> (-12.45%)	⬇️
...n/java/com/owncloud/android/utils/BitmapUtils.java	40.44% <0.00%> (-8.99%)	⬇️
...owncloud/android/ui/adapter/OCFileListAdapter.java	38.10% <0.00%> (-8.66%)	⬇️
...loud/android/datamodel/ThumbnailsCacheManager.java	32.84% <0.00%> (-6.21%)	⬇️
.../third_parties/daveKoeller/AlphanumComparator.java	80.95% <0.00%> (-2.39%)	⬇️
...ncloud/android/ui/fragment/OCFileListFragment.java	36.71% <0.00%> (-2.15%)	⬇️
... and 7 more

[Dulanic]

Seems to cause new issues. Now it sends notifications but if you press to resolve, it says can't open conflict resolution.

logs.txt

[AlvaroBrey]

Seems to cause new issues. Now it sends notifications but if you press to resolve, it says can't open conflict resolution.

logs.txt

That is most likely a separate issue (#9337 or #9026). Do you have app protection enabled? Anyway please open a bug report if needed rather than commenting on the PR. Thank you!