Skip to content

Check empty/same name on creating text files#10537

Merged
AlvaroBrey merged 1 commit intomasterfrom
followUpSameName
Aug 5, 2022
Merged

Check empty/same name on creating text files#10537
AlvaroBrey merged 1 commit intomasterfrom
followUpSameName

Conversation

@tobiasKaminsky
Copy link
Member

@tobiasKaminsky tobiasKaminsky commented Jul 18, 2022

To test

  • create a text/markdown file
  • create a second one
    • check same name
    • check empty name (.md)
    • check empty name ("")

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

  • Tests written, or not not needed

@codecov
Copy link

codecov bot commented Jul 18, 2022

Codecov Report

Merging #10537 (f8cb736) into master (eaef5fc) will increase coverage by 0.07%.
The diff coverage is 0.00%.

❗ Current head f8cb736 differs from pull request most recent head 75e8c94. Consider uploading reports for the commit 75e8c94 to get more accurate results

@@             Coverage Diff              @@
##             master   #10537      +/-   ##
============================================
+ Coverage     31.48%   31.56%   +0.07%     
- Complexity     3280     3281       +1     
============================================
  Files           540      540              
  Lines         40194    40188       -6     
  Branches       5554     5555       +1     
============================================
+ Hits          12657    12687      +30     
+ Misses        25634    25587      -47     
- Partials       1903     1914      +11     
Impacted Files Coverage Δ
.../android/ui/dialog/ChooseTemplateDialogFragment.kt 0.00% <0.00%> (ø)
...cloud/android/datamodel/UploadsStorageManager.java 70.03% <0.00%> (-2.17%) ⬇️
.../owncloud/android/ui/adapter/OCFileListDelegate.kt 49.63% <0.00%> (-1.46%) ⬇️
...loud/android/datamodel/ThumbnailsCacheManager.java 38.70% <0.00%> (-0.72%) ⬇️
...cloud/android/ui/activity/SyncedFoldersActivity.kt 19.50% <0.00%> (-0.23%) ⬇️
...cloud/android/ui/activity/FileDisplayActivity.java 26.19% <0.00%> (+0.08%) ⬆️
...wncloud/android/providers/FileContentProvider.java 27.04% <0.00%> (+0.09%) ⬆️
.../java/com/owncloud/android/utils/DisplayUtils.java 37.05% <0.00%> (+0.29%) ⬆️
...loud/android/datamodel/FileDataStorageManager.java 60.74% <0.00%> (+0.40%) ⬆️
.../owncloud/android/files/services/FileUploader.java 54.03% <0.00%> (+2.41%) ⬆️
... and 2 more

@tobiasKaminsky tobiasKaminsky changed the title also check if folder Check empty/same name on creating text files Jul 18, 2022
Co-authored-by: Álvaro Brey <alvaro.brey@nextcloud.com>
Signed-off-by: Tobias Kaminsky <tobias@nextcloud.com>
@github-actions
Copy link

github-actions bot commented Aug 4, 2022

Codacy

Lint

TypemasterPR
Warnings8585
Errors00

SpotBugs

CategoryBaseNew
Bad practice2929
Correctness4646
Dodgy code353353
Experimental11
Internationalization99
Multithreaded correctness99
Performance5959
Security2828
Total534534

@AlvaroBrey
Copy link
Member

/backport to stable-3.21

@github-actions
Copy link

github-actions bot commented Aug 4, 2022

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

@AlvaroBrey AlvaroBrey merged commit c99b5c1 into master Aug 5, 2022
@delete-merged-branch delete-merged-branch bot deleted the followUpSameName branch August 5, 2022 10:47
@AlvaroBrey AlvaroBrey added this to the Nextcloud App 3.22.0 milestone Aug 5, 2022
tsdicloud pushed a commit to nextmcloud/android that referenced this pull request Aug 18, 2022
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

Comments