Skip to content

Conversation

@tobiasKaminsky
Copy link
Member

@tobiasKaminsky tobiasKaminsky commented Aug 27, 2019

Fix #4375

This uploads file in corresponding subfolder, and creates it.

Signed-off-by: tobiasKaminsky tobias@kaminsky.me

@AndyScherzinger
Copy link
Member

Something went very wrong with Spotbugs...?!

Copy link
Member

@rullzer rullzer left a comment

Choose a reason for hiding this comment

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

The test APK fied the issue for me :)

@codecov
Copy link

codecov bot commented Sep 20, 2019

Codecov Report

Merging #4425 into master will increase coverage by 0.04%.
The diff coverage is 33.33%.

@@             Coverage Diff              @@
##             master    #4425      +/-   ##
============================================
+ Coverage     17.24%   17.29%   +0.04%     
  Complexity        3        3              
============================================
  Files           373      373              
  Lines         32076    32079       +3     
  Branches       4538     4538              
============================================
+ Hits           5533     5547      +14     
+ Misses        25643    25632      -11     
  Partials        900      900
Impacted Files Coverage Δ Complexity Δ
...ncloud/android/datamodel/SyncedFolderProvider.java 11.2% <ø> (ø) 0 <0> (ø) ⬇️
...n/java/com/owncloud/android/jobs/FilesSyncJob.java 0% <0%> (ø) 0 <0> (ø) ⬇️
...a/com/owncloud/android/utils/FileStorageUtils.java 25.36% <100%> (ø) 0 <0> (ø) ⬇️
...in/java/com/owncloud/android/utils/ThemeUtils.java 50% <0%> (-1.58%) 0% <0%> (ø)
.../java/com/owncloud/android/utils/DisplayUtils.java 24.47% <0%> (-0.43%) 0% <0%> (ø)
...loud/android/datamodel/FileDataStorageManager.java 36.5% <0%> (-0.08%) 0% <0%> (ø)
...owncloud/android/ui/adapter/OCFileListAdapter.java 29.82% <0%> (+0.19%) 0% <0%> (ø) ⬇️
...owncloud/android/ui/activity/SettingsActivity.java 38.75% <0%> (+0.2%) 0% <0%> (ø) ⬇️
...cloud/android/ui/activity/FileDisplayActivity.java 20.17% <0%> (+0.48%) 0% <0%> (ø) ⬇️
.../third_parties/daveKoeller/AlphanumComparator.java 82.14% <0%> (+1.19%) 0% <0%> (ø) ⬇️
... and 3 more

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
@nextcloud nextcloud deleted a comment Oct 1, 2019
@nextcloud nextcloud deleted a comment Oct 1, 2019
@nextcloud nextcloud deleted a comment Oct 1, 2019
@nextcloud-android-bot
Copy link
Collaborator

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

@nextcloud-android-bot
Copy link
Collaborator

Codacy

499

Lint

TypemasterPR
Warnings5959
Errors00

SpotBugs (new)

Warning TypeNumber
Bad practice Warnings27
Correctness Warnings69
Internationalization Warnings12
Malicious code vulnerability Warnings4
Multithreaded correctness Warnings9
Performance Warnings120
Security Warnings47
Dodgy code Warnings139
Total427

SpotBugs (master)

Warning TypeNumber
Bad practice Warnings27
Correctness Warnings69
Internationalization Warnings12
Malicious code vulnerability Warnings4
Multithreaded correctness Warnings9
Performance Warnings120
Security Warnings47
Dodgy code Warnings139
Total427

@AndyScherzinger
Copy link
Member

/backport to stable-3.8

@AndyScherzinger AndyScherzinger merged commit ea696c5 into master Oct 1, 2019
@delete-merged-branch delete-merged-branch bot deleted the autoUploadSubfolder branch October 1, 2019 14:02
@AndyScherzinger AndyScherzinger added this to the Nextcloud App 3.9.0 milestone Oct 1, 2019
@backportbot-nextcloud
Copy link

The backport to stable-3.8 failed. Please do this backport manually.

@AndyScherzinger
Copy link
Member

@tobiasKaminsky can you do a manual backport (IMHO we should just backport any fix except for very large ones)

tobiasKaminsky added a commit that referenced this pull request Oct 2, 2019
ea696c5 Merge pull request #4425 from nextcloud/autoUploadSubfolder
37c6600 Upload files into subfolder
a1c28f9 Merge pull request #4470 from stephanritscher/master
9c1fedb add test cases
6184fcd add test cases
0f97564 Merge pull request #4208 from nextcloud/ezaquarii/new-media-player-service
d83792e [tx-robot] updated from transifex
9a2fc28 [tx-robot] updated from transifex
f10843e daily dev 20190928
tobiasKaminsky added a commit that referenced this pull request Oct 2, 2019
Backport of #4425: Upload files into subfolder
@erikkroes
Copy link

Can this be merged please? Would mean a lot if it could!

@AndyScherzinger
Copy link
Member

@erikkroes this PR has been merged last year in October! Shipped with 3.9.0

@erikkroes
Copy link

Ah, sorry for the confusion. I must have some updating to do then.

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.

Auto upload with Motion Photos

6 participants