Skip to content

fix(upload-list): conflict check npe#16868

Merged
alperozturk96 merged 2 commits intomasterfrom
fix/upload-list-adapter-npe
Apr 17, 2026
Merged

fix(upload-list): conflict check npe#16868
alperozturk96 merged 2 commits intomasterfrom
fix/upload-list-adapter-npe

Conversation

@alperozturk96
Copy link
Copy Markdown
Collaborator

Issue

On some devices's db might not getParentRemotePath exists, thus app should check that.

Exception in thread "DefaultDispatcher-worker-2" java.lang.NullPointerException: Attempt to invoke virtual method 'java.lang.String com.owncloud.android.datamodel.OCFile.getParentRemotePath()' on a null object reference
    at com.owncloud.android.ui.activity.UploadListActivity$retryUpload$1.invokeSuspend(UploadListActivity.kt:325)
    at kotlin.coroutines.jvm.internal.BaseContinuationImpl.resumeWith(ContinuationImpl.kt:34)
    at kotlinx.coroutines.DispatchedTask.run(DispatchedTask.kt:101)
    at kotlinx.coroutines.internal.LimitedDispatcher$Worker.run(LimitedDispatcher.kt:113)
    at kotlinx.coroutines.scheduling.TaskImpl.run(Tasks.kt:89)
    at kotlinx.coroutines.scheduling.CoroutineScheduler.runSafely(CoroutineScheduler.kt:589)
    at kotlinx.coroutines.scheduling.CoroutineScheduler$Worker.executeTask(CoroutineScheduler.kt:823)
    at kotlinx.coroutines.scheduling.CoroutineScheduler$Worker.runWorker(CoroutineScheduler.kt:720)
    at kotlinx.coroutines.scheduling.CoroutineScheduler$Worker.run(CoroutineScheduler.kt:707)

Changes

  • NPE check
  • Dismiss conflict resolve notification automatically after resolving from Upload list screen

@alperozturk96
Copy link
Copy Markdown
Collaborator Author

/backport to stable-33.1.0

@github-actions
Copy link
Copy Markdown

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

Signed-off-by: alperozturk96 <alper_ozturk@proton.me>
Signed-off-by: alperozturk96 <alper_ozturk@proton.me>
@alperozturk96 alperozturk96 force-pushed the fix/upload-list-adapter-npe branch from 3c7f061 to 2c237ea Compare April 17, 2026 06:42
@github-actions
Copy link
Copy Markdown

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

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

@github-actions
Copy link
Copy Markdown

Codacy

SpotBugs

CategoryBaseNew
Bad practice3535
Correctness6969
Dodgy code226224
Experimental11
Internationalization77
Malicious code vulnerability22
Multithreaded correctness3434
Performance4242
Security1616
Total432430

@alperozturk96 alperozturk96 merged commit 36c63b8 into master Apr 17, 2026
14 of 19 checks passed
@alperozturk96 alperozturk96 deleted the fix/upload-list-adapter-npe branch April 17, 2026 09:25
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.

1 participant