Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[stable-3.28] Remove user notification for autoupload edge cases #12452

Merged
merged 2 commits into from
Jan 29, 2024

Conversation

JonasMayerDev
Copy link
Collaborator

Manual backport of #12413

  • Tests written, or not not needed

Signed-off-by: Jonas Mayer <[email protected]>
Signed-off-by: Jonas Mayer <[email protected]>
Copy link

Lint

Typestable-3.28PR
Warnings6969
Errors33

SpotBugs

CategoryBaseNew
Bad practice2626
Correctness7373
Dodgy code360360
Experimental22
Internationalization77
Malicious code vulnerability22
Multithreaded correctness66
Performance5454
Security1818
Total548548

Copy link

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

Copy link

codecov bot commented Jan 29, 2024

Codecov Report

Merging #12452 (ccaf8b1) into stable-3.28 (9fb5703) will decrease coverage by 0.22%.
The diff coverage is 5.00%.

Additional details and impacted files
@@                Coverage Diff                @@
##             stable-3.28   #12452      +/-   ##
=================================================
- Coverage          28.05%   27.84%   -0.22%     
+ Complexity          3387     3369      -18     
=================================================
  Files                621      621              
  Lines              45753    45791      +38     
  Branches            6569     6582      +13     
=================================================
- Hits               12838    12752      -86     
- Misses             30748    30912     +164     
+ Partials            2167     2127      -40     
Files Coverage Δ
...ain/java/com/owncloud/android/db/UploadResult.java 38.55% <66.66%> (-2.19%) ⬇️
...ava/com/nextcloud/client/jobs/FilesUploadWorker.kt 54.91% <0.00%> (-13.14%) ⬇️
...cloud/android/datamodel/UploadsStorageManager.java 65.35% <0.00%> (-5.67%) ⬇️
...owncloud/android/ui/adapter/UploadListAdapter.java 0.00% <0.00%> (ø)
...va/com/owncloud/android/utils/FilesUploadHelper.kt 52.94% <0.00%> (-11.35%) ⬇️

... and 16 files with indirect coverage changes

@AndyScherzinger AndyScherzinger changed the title [Backport to 3.28] Remove user notification for autoupload edge cases [stable-3.28] Remove user notification for autoupload edge cases Jan 29, 2024
Copy link

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

@AndyScherzinger AndyScherzinger merged commit 19ead91 into stable-3.28 Jan 29, 2024
16 of 18 checks passed
@delete-merged-branch delete-merged-branch bot deleted the backport_sync_conflict_bugfix branch January 29, 2024 21:36
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.

2 participants