Skip to content

fix(upload): grant parent existence - #17399

Merged
alperozturk96 merged 6 commits into
masterfrom
fix/handle-parent-existence-for-conflicts
Aug 17, 2026
Merged

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

Conversation

@alperozturk96

@alperozturk96 alperozturk96 commented Jul 30, 2026

Copy link
Copy Markdown
Collaborator

No description provided.

@alperozturk96 alperozturk96 linked an issue Jul 30, 2026 that may be closed by this pull request
Moving files automatically via script causing sync conflicts #17074
Closed
@alperozturk96 alperozturk96 added this to the Nextcloud App 34.1.1 milestone Jul 30, 2026
alperozturk96
alperozturk96 commented Jul 30, 2026
View reviewed changes
Comment thread app/src/androidTest/java/com/owncloud/android/GrantFolderExistenceTests.kt
import org.junit.Test
import java.io.IOException

class GrantFolderExistenceTests : AbstractOnServerIT() {

@alperozturk96 alperozturk96 Jul 30, 2026

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 alperozturk96 mentioned this pull request Jul 30, 2026
Closed
@alperozturk96

alperozturk96 commented Jul 30, 2026

Copy link
Copy Markdown
Collaborator Author

/backport to stable-34.1.x

alperozturk96
alperozturk96 commented Jul 30, 2026
View reviewed changes
Comment thread app/src/main/java/com/nextcloud/client/jobs/upload/FileUploadHelper.kt Outdated
alperozturk96
alperozturk96 commented Jul 30, 2026
View reviewed changes
Comment thread app/src/androidTest/java/com/owncloud/android/GrantFolderExistenceTests.kt Outdated
alperozturk96
alperozturk96 commented Jul 30, 2026
View reviewed changes
Comment thread app/src/androidTest/java/com/owncloud/android/GrantFolderExistenceTests.kt Outdated
alperozturk96
alperozturk96 commented Jul 30, 2026
View reviewed changes
Comment thread app/src/main/java/com/nextcloud/utils/extensions/UploadResultExtensions.kt
fun UploadResult.isNonRetryable(): Boolean = when (this) {
UploadResult.FILE_NOT_FOUND,
UploadResult.FILE_ERROR,
UploadResult.FOLDER_ERROR,

@alperozturk96 alperozturk96 Jul 30, 2026

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

github-actions Bot commented Jul 30, 2026

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

github-actions Bot commented Aug 14, 2026

Copy link
Copy Markdown

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

alperozturk96 and others added 6 commits August 17, 2026 10:49
@alperozturk96
fix alignment
af06e18 
Signed-off-by: alperozturk96 <alper_ozturk@proton.me>
@alperozturk96
add tests
a9e9a67 
Signed-off-by: alperozturk96 <alper_ozturk@proton.me>
@alperozturk96
add tests
32f5dd6 
Signed-off-by: alperozturk96 <alper_ozturk@proton.me>
@alperozturk96
Apply suggestion from @alperozturk96
bd0e722 
Signed-off-by: Alper 脰zt眉rk <67455295+alperozturk96@users.noreply.github.com>
@alperozturk96
Apply suggestion from @alperozturk96
95443be 
Signed-off-by: Alper 脰zt眉rk <67455295+alperozturk96@users.noreply.github.com>
@alperozturk96
Apply suggestion from @alperozturk96
50fef3a 
Signed-off-by: Alper 脰zt眉rk <67455295+alperozturk96@users.noreply.github.com>
@alperozturk96
alperozturk96 force-pushed the fix/handle-parent-existence-for-conflicts branch from be01105 to 50fef3a Compare August 17, 2026 08:49
@github-actions

github-actions Bot commented Aug 17, 2026

Copy link
Copy Markdown

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

@github-actions

github-actions Bot commented Aug 17, 2026

Copy link
Copy Markdown

APK file: https://github.com/nextcloud/android/actions/runs/32012161026/artifacts/9282631959
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

github-actions Bot commented Aug 17, 2026

Copy link
Copy Markdown

Codacy

SpotBugs

CategoryBaseNew
Bad practice3232
Correctness5959
Dodgy code207207
Experimental11
Malicious code vulnerability22
Multithreaded correctness2525
Performance3939
Security1919
Total384384

@alperozturk96
alperozturk96 merged commit 6629b69 into master Aug 17, 2026
20 of 22 checks passed
@alperozturk96
alperozturk96 deleted the fix/handle-parent-existence-for-conflicts branch August 17, 2026 09:40
@backportbot backportbot Bot mentioned this pull request Aug 17, 2026
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

3. to review feature: auto upload

Projects

None yet

Milestone

Nextcloud App 34.1.1

Development

Successfully merging this pull request may close these issues.

Moving files automatically via script causing sync conflicts

1 participant

@alperozturk96