Skip to content

fix(upload): grant parent existence - #17399

Open
alperozturk96 wants to merge 6 commits into
masterfrom
fix/handle-parent-existence-for-conflicts
Open

fix(upload): grant parent existence#17399
alperozturk96 wants to merge 6 commits into
masterfrom
fix/handle-parent-existence-for-conflicts

Conversation

@alperozturk96

Copy link
Copy Markdown
Collaborator

No description provided.

Signed-off-by: alperozturk96 <alper_ozturk@proton.me>
Signed-off-by: alperozturk96 <alper_ozturk@proton.me>
Signed-off-by: alperozturk96 <alper_ozturk@proton.me>
import org.junit.Test
import java.io.IOException

class GrantFolderExistenceTests : AbstractOnServerIT() {

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

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

Test fails on master that proves: #17074

Image

@alperozturk96

Copy link
Copy Markdown
Collaborator Author

/backport to stable-34.1.x

Comment thread app/src/main/java/com/nextcloud/client/jobs/upload/FileUploadHelper.kt Outdated
Signed-off-by: Alper Öztürk <67455295+alperozturk96@users.noreply.github.com>
Comment thread app/src/androidTest/java/com/owncloud/android/GrantFolderExistenceTests.kt Outdated
Signed-off-by: Alper Öztürk <67455295+alperozturk96@users.noreply.github.com>
Comment thread app/src/androidTest/java/com/owncloud/android/GrantFolderExistenceTests.kt Outdated
Signed-off-by: Alper Öztürk <67455295+alperozturk96@users.noreply.github.com>
fun UploadResult.isNonRetryable(): Boolean = when (this) {
UploadResult.FILE_NOT_FOUND,
UploadResult.FILE_ERROR,
UploadResult.FOLDER_ERROR,

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

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

UploadResult.FOLDER_ERROR this must be excluded from isNonRetryable

@github-actions

Copy link
Copy Markdown

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

@github-actions

Copy link
Copy Markdown

APK file: https://github.com/nextcloud/android/actions/runs/30551171581/artifacts/8763661996
To test this change/fix you can simply download above APK file and install and test it in parallel to your existing Nextcloud app.
qrcode (please click on link to get QR code displayed)

@github-actions

Copy link
Copy Markdown

Codacy

SpotBugs

CategoryBaseNew
Bad practice3232
Correctness6464
Dodgy code206206
Experimental11
Malicious code vulnerability22
Multithreaded correctness2525
Performance4040
Security1919
Total389389

@github-actions

Copy link
Copy Markdown

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Moving files automatically via script causing sync conflicts

1 participant