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

Remove File Upload Service #12327

Merged
merged 46 commits into from
Jan 29, 2024
Merged

Conversation

alperozturk96
Copy link
Collaborator

@alperozturk96 alperozturk96 commented Dec 25, 2023

  • Tests written, or not not needed

@alperozturk96
Copy link
Collaborator Author

Some tests are failing due to "Waited for the root of the view hierarchy to have window focus and not request layout for 10 seconds. If you specified a non default root matcher, it may be picking a root that never takes focus"

We can try with newest Espresso Version. Same topic

@alperozturk96 alperozturk96 force-pushed the refactor/remove-file-upload-service branch from b6bd558 to 3fcb2fb Compare December 29, 2023 13:31
@alperozturk96
Copy link
Collaborator Author

First we need to merge Use Work Manager For File Download #12308 then we can use common logics for this PR (for e.g removing ServiceConnection logic) as well.

Copy link
Collaborator

@JonasMayerDev JonasMayerDev left a comment

Choose a reason for hiding this comment

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

Seems like everything is working as before or better...

Copy link
Collaborator

@ZetaTom ZetaTom left a comment

Choose a reason for hiding this comment

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

Other than the one thing I've commented on, which might just be a red herring, this works perfectly.

@JonasMayerDev JonasMayerDev force-pushed the refactor/remove-file-upload-service branch from 37dd6d7 to 23c2e25 Compare January 26, 2024 17:56
Copy link

codecov bot commented Jan 26, 2024

Codecov Report

Merging #12327 (23c2e25) into master (9492301) will increase coverage by 0.32%.
The diff coverage is 45.74%.

Additional details and impacted files
@@             Coverage Diff              @@
##             master   #12327      +/-   ##
============================================
+ Coverage     27.61%   27.94%   +0.32%     
- Complexity     3326     3355      +29     
============================================
  Files           621      622       +1     
  Lines         45814    45421     -393     
  Branches       6578     6496      -82     
============================================
+ Hits          12653    12694      +41     
+ Misses        31045    30600     -445     
- Partials       2116     2127      +11     
Files Coverage Δ
.../src/debug/java/com/nextcloud/test/TestActivity.kt 60.78% <ø> (ø)
...java/com/nextcloud/client/di/ComponentsModule.java 0.00% <ø> (ø)
...main/java/com/nextcloud/client/etm/EtmViewModel.kt 0.00% <ø> (ø)
...tcloud/client/etm/pages/EtmFileTransferFragment.kt 0.00% <ø> (ø)
...c/main/java/com/nextcloud/client/files/Registry.kt 94.33% <ø> (ø)
...rc/main/java/com/nextcloud/client/files/Request.kt 74.19% <ø> (ø)
.../com/nextcloud/client/jobs/BackgroundJobFactory.kt 59.23% <100.00%> (ø)
.../com/nextcloud/client/jobs/BackgroundJobManager.kt 0.00% <ø> (ø)
.../nextcloud/client/jobs/BackgroundJobManagerImpl.kt 62.17% <100.00%> (+0.49%) ⬆️
...va/com/nextcloud/client/jobs/ContactsBackupWork.kt 67.60% <ø> (ø)
... and 60 more

... and 17 files with indirect coverage changes

Signed-off-by: alperozturk <[email protected]>
Signed-off-by: alperozturk <[email protected]>
Signed-off-by: alperozturk <[email protected]>
Signed-off-by: alperozturk <[email protected]>
alperozturk96 and others added 22 commits January 27, 2024 12:45
Signed-off-by: alperozturk <[email protected]>
Signed-off-by: alperozturk <[email protected]>
Signed-off-by: alperozturk <[email protected]>
Signed-off-by: alperozturk <[email protected]>
Signed-off-by: alperozturk <[email protected]>
Signed-off-by: alperozturk <[email protected]>
Signed-off-by: alperozturk <[email protected]>
Signed-off-by: alperozturk <[email protected]>
Signed-off-by: Jonas Mayer <[email protected]>
Signed-off-by: Jonas Mayer <[email protected]>
Signed-off-by: Jonas Mayer <[email protected]>
Signed-off-by: Jonas Mayer <[email protected]>
Signed-off-by: Jonas Mayer <[email protected]>
Signed-off-by: Jonas Mayer <[email protected]>
Signed-off-by: Jonas Mayer <[email protected]>
Signed-off-by: Jonas Mayer <[email protected]>
@JonasMayerDev JonasMayerDev force-pushed the refactor/remove-file-upload-service branch from 23c2e25 to 7f3a64d Compare January 27, 2024 11:45
Copy link

Codacy

Lint

TypemasterPR
Warnings6969
Errors33

SpotBugs

CategoryBaseNew
Bad practice2626
Correctness7373
Dodgy code360359
Experimental22
Internationalization77
Malicious code vulnerability22
Multithreaded correctness66
Performance5454
Security1818
Total548547

Copy link

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

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

@tobiasKaminsky tobiasKaminsky merged commit 1dc6262 into master Jan 29, 2024
19 of 20 checks passed
@delete-merged-branch delete-merged-branch bot deleted the refactor/remove-file-upload-service branch January 29, 2024 10:54
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.

Use WorkManager for FileDownloader and FileTransferService (rework file transfers)
4 participants