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

Add DAVx5 as new app name for DAVdroid #3504

Merged
merged 1 commit into from
Jan 28, 2019
Merged

Add DAVx5 as new app name for DAVdroid #3504

merged 1 commit into from
Jan 28, 2019

Conversation

AndyScherzinger
Copy link
Member

Resolves #3502

Signed-off-by: Andy Scherzinger info@andy-scherzinger.de

@codecov
Copy link

codecov bot commented Jan 28, 2019

Codecov Report

Merging #3504 into master will decrease coverage by <.01%.
The diff coverage is n/a.

@@             Coverage Diff             @@
##             master   #3504      +/-   ##
===========================================
- Coverage      6.13%   6.13%   -0.01%     
  Complexity        1       1              
===========================================
  Files           316     316              
  Lines         30697   30697              
  Branches       4392    4392              
===========================================
- Hits           1884    1883       -1     
  Misses        28531   28531              
- Partials        282     283       +1
Impacted Files Coverage Δ Complexity Δ
.../third_parties/daveKoeller/AlphanumComparator.java 82.14% <0%> (-1.2%) 0% <0%> (ø)

@@ -49,8 +49,8 @@
<string name="prefs_enable_media_scan_notifications_summary">Notify about newly found media folders</string>
<string name="prefs_log_delete_history_button">Delete history</string>
<string name="prefs_calendar_contacts">Sync calendar &amp; contacts</string>
<string name="prefs_calendar_contacts_summary">Set up DAVdroid (v1.3.0+) for current account</string>
<string name="prefs_calendar_contacts_address_resolve_error">Server address for the account could not be resolved for DAVdroid</string>
<string name="prefs_calendar_contacts_summary">Set up DAVx5 (DAVdroid) (v1.3.0+) for current account</string>
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
<string name="prefs_calendar_contacts_summary">Set up DAVx5 (DAVdroid) (v1.3.0+) for current account</string>
<string name="prefs_calendar_contacts_summary">Set up DAVx5 (formerly known as DAVdroid) (v1.3.0+) for current account</string>

Maybe?

Copy link
Member Author

Choose a reason for hiding this comment

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

I did like der play store listing: https://play.google.com/store/apps/details?id=at.bitfire.davdroid&hl=en But I am fine either way. What do you thing @tobiasKaminsky ?

Copy link
Member

Choose a reason for hiding this comment

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

Having it a bit more verbose for unknown users cannot harm :-)

@@ -49,8 +49,8 @@
<string name="prefs_enable_media_scan_notifications_summary">Notify about newly found media folders</string>
<string name="prefs_log_delete_history_button">Delete history</string>
<string name="prefs_calendar_contacts">Sync calendar &amp; contacts</string>
<string name="prefs_calendar_contacts_summary">Set up DAVdroid (v1.3.0+) for current account</string>
<string name="prefs_calendar_contacts_address_resolve_error">Server address for the account could not be resolved for DAVdroid</string>
<string name="prefs_calendar_contacts_summary">Set up DAVx5 (DAVdroid) (v1.3.0+) for current account</string>
Copy link
Member

Choose a reason for hiding this comment

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

Having it a bit more verbose for unknown users cannot harm :-)

@AndyScherzinger
Copy link
Member Author

@tobiasKaminsky @nickvergessen changed the text according to your review comment. 👍

@tobiasKaminsky
Copy link
Member

👍

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
@nextcloud-android-bot
Copy link
Collaborator

Lint

TypemasterPR
Warnings6969
Errors00

FindBugs (new)

Warning TypeNumber
Bad practice Warnings33
Correctness Warnings156
Internationalization Warnings15
Malicious code vulnerability Warnings12
Multithreaded correctness Warnings9
Performance Warnings117
Security Warnings58
Dodgy code Warnings134
Total534

FindBugs (master)

Warning TypeNumber
Bad practice Warnings33
Correctness Warnings156
Internationalization Warnings15
Malicious code vulnerability Warnings12
Multithreaded correctness Warnings9
Performance Warnings117
Security Warnings58
Dodgy code Warnings134
Total534

@AndyScherzinger AndyScherzinger merged commit 220a869 into master Jan 28, 2019
@AndyScherzinger AndyScherzinger deleted the DAVx5 branch January 28, 2019 17:08
@AndyScherzinger AndyScherzinger added this to the Nextcloud App 3.5.0 milestone Jan 28, 2019
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.

None yet

4 participants