aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2015-12-07 13:17:06 +0100
committerDaniel Gultsch <daniel@gultsch.de>2015-12-07 13:24:41 +0100
commitac06cb2e4f8f4d2821265847376e651b08c38e31 (patch)
tree655b631c010305e787e21cd2298f8287c65f3850
parent739648e909446c83fe1474636b8465a7ef91cce2 (diff)
modified contact permission dialog
Diffstat (limited to '')
-rw-r--r--src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java2
-rw-r--r--src/main/res/values/strings.xml3
2 files changed, 2 insertions, 3 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java
index f6a38647..caf3d3db 100644
--- a/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java
@@ -600,7 +600,7 @@ public class StartConversationActivity extends XmppActivity implements OnRosterU
AlertDialog.Builder builder = new AlertDialog.Builder(this);
builder.setTitle(R.string.sync_with_contacts);
builder.setMessage(R.string.sync_with_contacts_long);
- builder.setPositiveButton(R.string.sync_now, new OnClickListener() {
+ builder.setPositiveButton(R.string.next, new OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 25af5be1..d3cda866 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -559,6 +559,5 @@
<string name="shared_image_with_x">Shared image with %s</string>
<string name="no_storage_permission">Conversations need access to external storage</string>
<string name="sync_with_contacts">Synchronize with contacts</string>
- <string name="sync_with_contacts_long">Conversations wants to match your XMPP roster with your contacts to show their full names and avatars.\n\nConversations will only read your contacts and match them locally without uploading them to your server.</string>
- <string name="sync_now">Synchronize now</string>
+ <string name="sync_with_contacts_long">Conversations wants to match your XMPP roster with your contacts to show their full names and avatars.\n\nConversations will only read your contacts and match them locally without uploading them to your server.\n\nYou will now be asked to grant permission to access your contacts.</string>
</resources>