Upload are deleted after decision was made in conflict activity

[tobiasKaminsky]

Fix #7082
Fix #6963
Fix #6692
Fix #5755

Signed-off-by: tobiasKaminsky tobias@kaminsky.me

Testing

Writing tests is very important. Please try to write some tests for your PR.
If you need help, please do not hesitate to ask in this PR for help.

unit tests
instrumented tests
UI tests

• Tests written, or not not needed

[AndyScherzinger]

LGTM, screenshots for tests need to be updated though

[nextcloud-android-bot]

Here is an overview of what got changed by this pull request:

Issues
======
- Added 1
           

See the complete overview on Codacy

[nextcloud-android-bot]

Codacy found an issue: These nested if statements could be combined

[nextcloud-android-bot]

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

master-light-blue-Screenshot test failed: https://www.kaminsky.me/nc-dev/android-integrationTests/16338-Screenshot-master-light-blue

[nextcloud-android-bot]

stable-light-blue-Screenshot test failed: https://www.kaminsky.me/nc-dev/android-integrationTests/16338-Screenshot-stable-light-blue

[nextcloud-android-bot]

stable-IT test failed: https://www.kaminsky.me/nc-dev/android-integrationTests/16338-IT-stable

[nextcloud-android-bot]

Codacy

Lint

Type	master	PR
Warnings	337	337
Errors	0	0

SpotBugs (new)

Warning Type	Number
Bad practice Warnings	27
Correctness Warnings	53
Internationalization Warnings	9
Multithreaded correctness Warnings	9
Performance Warnings	72
Security Warnings	44
Dodgy code Warnings	102
Total	316

SpotBugs (master)

Warning Type	Number
Bad practice Warnings	27
Correctness Warnings	53
Internationalization Warnings	9
Multithreaded correctness Warnings	9
Performance Warnings	72
Security Warnings	44
Dodgy code Warnings	102
Total	316

[nextcloud-android-bot]

master-IT test failed: https://www.kaminsky.me/nc-dev/android-integrationTests/16338-IT-master