[stable-3.11] Make the name collision policy for auto uploads selectable#5883
Merged
Conversation
Signed-off-by: Joachim Meyer <joachim@joameyer.de>
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
tobiasKaminsky
force-pushed
the
backport/5810/stable-3.11
branch
from
656abc9 to
afacede
Compare
Collaborator
|
Issues
======
+ Solved 8
- Added 5
Complexity increasing per file
==============================
- src/main/java/com/owncloud/android/providers/FileContentProvider.java 3
See the complete overview on Codacy |
| private String localPath; | ||
| private String remotePath; | ||
| private boolean wifiOnly = false; | ||
| private boolean chargingOnly = false; |
Collaborator
There was a problem hiding this comment.
| private Integer uploadAction; | ||
| private FileUploader.NameCollisionPolicy nameCollisionPolicy = FileUploader.NameCollisionPolicy.ASK_USER; | ||
| private MediaFolderType type; | ||
| private boolean hidden = false; |
Collaborator
There was a problem hiding this comment.
| private String folderName; | ||
| private String localPath; | ||
| private String remotePath; | ||
| private boolean wifiOnly = false; |
Collaborator
There was a problem hiding this comment.
| private boolean chargingOnly = false; | ||
| private boolean existing = true; | ||
| private boolean enabled = false; | ||
| private boolean subfolderByDate = false; |
Collaborator
There was a problem hiding this comment.
| private boolean wifiOnly = false; | ||
| private boolean chargingOnly = false; | ||
| private boolean existing = true; | ||
| private boolean enabled = false; |
Collaborator
There was a problem hiding this comment.
Member
|
I manually cherry-picked this |
Collaborator
Lint
SpotBugs (new)
SpotBugs (stable-3.11)
SpotBugs increased! |
Collaborator
|
IT test failed: https://www.kaminsky.me/nc-dev/android-integrationTests/13557-IT |
Collaborator
Lint
SpotBugs (new)
SpotBugs (stable-3.11)
SpotBugs increased! |
Collaborator
|
IT test failed: https://www.kaminsky.me/nc-dev/android-integrationTests/13582-IT |
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
Collaborator
|
APK file: https://www.kaminsky.me/nc-dev/android-artifacts/13592.apk |
Collaborator
Lint
SpotBugs (new)
SpotBugs (stable-3.11)
|
Collaborator
|
IT test failed: https://www.kaminsky.me/nc-dev/android-integrationTests/13592-IT |
tobiasKaminsky
approved these changes
Apr 16, 2020
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
backport of #5810