Skip to content

Fix upload conflict in encrypted folder#10560

Open
tobiasKaminsky wants to merge 3 commits intomasterfrom
e2e_error_conflict
Open

Fix upload conflict in encrypted folder#10560
tobiasKaminsky wants to merge 3 commits intomasterfrom
e2e_error_conflict

Conversation

@tobiasKaminsky
Copy link
Member

@tobiasKaminsky tobiasKaminsky commented Jul 26, 2022 •
edited by AlvaroBrey
Loading

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

Fixes #2023

  • Tests written, or not not needed

tsdicloud pushed a commit to nextmcloud/android that referenced this pull request Aug 18, 2022
@VedantAchtani
Fixed - Uploading duplicate file shows 'Error creating conflict dialo…
8cf8150 
…g!'. NC PR: nextcloud#10560
@AlvaroBrey AlvaroBrey self-requested a review November 23, 2022 10:35
@AlvaroBrey
Copy link
Member

AlvaroBrey commented Nov 23, 2022

/rebase

@github-actions
Copy link

github-actions bot commented Nov 23, 2022

blue-Light-IT test failed: https://www.kaminsky.me/nc-dev/android-integrationTests/10560-Screenshot-blue-Light-11-07

@tobiasKaminsky
Copy link
Member Author

tobiasKaminsky commented Jan 30, 2023

/rebase

@tobiasKaminsky
Fix upload conflict in encrypted folder
70f4e3f 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
@tobiasKaminsky
wip
0761687 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
@tobiasKaminsky
wip
3575ca4 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
@github-actions
Copy link

github-actions bot commented Jan 30, 2023

Codacy

Lint

TypemasterPR
Warnings7676
Errors00

SpotBugs

CategoryBaseNew
Bad practice2727
Correctness4444
Dodgy code334334
Internationalization99
Multithreaded correctness99
Performance5858
Security1818
Total499499

@github-actions
Copy link

github-actions bot commented Jan 30, 2023

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

qrcode

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
Copy link
Collaborator

nextcloud-android-bot commented Jan 30, 2023

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

@nextcloud-android-bot
Copy link
Collaborator

nextcloud-android-bot commented Jan 30, 2023

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

@AlvaroBrey
Copy link
Member

AlvaroBrey commented Feb 22, 2023

@tobiasKaminsky I'm not sure how to resolve the conflict in UploadFileOperation

surinder-tsys
surinder-tsys reviewed Sep 6, 2023
View reviewed changes
app/src/main/java/com/owncloud/android/ui/activity/ConflictsResolveActivity.java
break;
case KEEP_SERVER: // Download
if (newFile.isEncrypted()) {
return;
Copy link
Collaborator

@surinder-tsys surinder-tsys Sep 6, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Instead of return it should be break so that finish() function on line number 161 has to execute else the activity won't finish at all.

@surinder-tsys surinder-tsys mentioned this pull request Sep 6, 2023
Open
1 task
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@surinder-tsys surinder-tsys surinder-tsys left review comments

@AlvaroBrey AlvaroBrey Awaiting requested review from AlvaroBrey

At least 1 approving review is required to merge this pull request.

Assignees

No one assigned

Labels

3. to review

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Failure in uploading/copying file to encrypted folder

4 participants

@tobiasKaminsky @AlvaroBrey @nextcloud-android-bot @surinder-tsys

Comments