slightly change wording of sync_with_contacts_long
This commit is contained in:
parent
b808a03702
commit
9f869d3895
|
@ -732,17 +732,27 @@ public class StartConversationActivity extends XmppActivity implements XmppConne
|
||||||
if (checkSelfPermission(Manifest.permission.READ_CONTACTS) != PackageManager.PERMISSION_GRANTED) {
|
if (checkSelfPermission(Manifest.permission.READ_CONTACTS) != PackageManager.PERMISSION_GRANTED) {
|
||||||
if (mRequestedContactsPermission.compareAndSet(false, true)) {
|
if (mRequestedContactsPermission.compareAndSet(false, true)) {
|
||||||
if (shouldShowRequestPermissionRationale(Manifest.permission.READ_CONTACTS)) {
|
if (shouldShowRequestPermissionRationale(Manifest.permission.READ_CONTACTS)) {
|
||||||
AlertDialog.Builder builder = new AlertDialog.Builder(this);
|
final AlertDialog.Builder builder = new AlertDialog.Builder(this);
|
||||||
|
final AtomicBoolean requestPermission = new AtomicBoolean(false);
|
||||||
builder.setTitle(R.string.sync_with_contacts);
|
builder.setTitle(R.string.sync_with_contacts);
|
||||||
if (QuickConversationsService.isQuicksy()) {
|
if (QuickConversationsService.isQuicksy()) {
|
||||||
builder.setMessage(Html.fromHtml(getString(R.string.sync_with_contacts_quicksy)));
|
builder.setMessage(Html.fromHtml(getString(R.string.sync_with_contacts_quicksy)));
|
||||||
} else {
|
} else {
|
||||||
builder.setMessage(getString(R.string.sync_with_contacts_long, getString(R.string.app_name)));
|
builder.setMessage(getString(R.string.sync_with_contacts_long, getString(R.string.app_name)));
|
||||||
}
|
}
|
||||||
builder.setPositiveButton(R.string.next, (dialog, which) -> requestPermissions(new String[]{Manifest.permission.READ_CONTACTS}, REQUEST_SYNC_CONTACTS));
|
builder.setPositiveButton(R.string.next, (dialog, which) -> {
|
||||||
builder.setOnDismissListener(dialog -> requestPermissions(new String[]{Manifest.permission.READ_CONTACTS}, REQUEST_SYNC_CONTACTS));
|
if (requestPermission.compareAndSet(false, true)) {
|
||||||
|
requestPermissions(new String[]{Manifest.permission.READ_CONTACTS}, REQUEST_SYNC_CONTACTS);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
builder.setOnDismissListener(dialog -> {
|
||||||
|
if (requestPermission.compareAndSet(false, true)) {
|
||||||
|
requestPermissions(new String[]{Manifest.permission.READ_CONTACTS}, REQUEST_SYNC_CONTACTS);
|
||||||
|
|
||||||
|
}
|
||||||
|
});
|
||||||
builder.setCancelable(false);
|
builder.setCancelable(false);
|
||||||
AlertDialog dialog = builder.create();
|
final AlertDialog dialog = builder.create();
|
||||||
dialog.setCanceledOnTouchOutside(false);
|
dialog.setCanceledOnTouchOutside(false);
|
||||||
dialog.setOnShowListener(dialogInterface -> {
|
dialog.setOnShowListener(dialogInterface -> {
|
||||||
final TextView tv = dialog.findViewById(android.R.id.message);
|
final TextView tv = dialog.findViewById(android.R.id.message);
|
||||||
|
|
|
@ -507,7 +507,7 @@
|
||||||
<string name="no_storage_permission">Grant %1$s access to external storage</string>
|
<string name="no_storage_permission">Grant %1$s access to external storage</string>
|
||||||
<string name="no_camera_permission">Grant %1$s access to the camera</string>
|
<string name="no_camera_permission">Grant %1$s access to the camera</string>
|
||||||
<string name="sync_with_contacts">Synchronize with contacts</string>
|
<string name="sync_with_contacts">Synchronize with contacts</string>
|
||||||
<string name="sync_with_contacts_long">%1$s wants permission to access your contacts to match your XMPP contact list with your contacts to show their full names and avatars.\n\nIt will only read your contacts and match them locally without uploading them to your server.</string>
|
<string name="sync_with_contacts_long">%1$s wants permission to access your address book to match it with your XMPP contact list.\nThis will display your contacts’ full names and avatars.\n\n%1$s will only read your address book and match it locally without uploading anything to your server.</string>
|
||||||
<string name="sync_with_contacts_quicksy"><![CDATA[Quicksy needs access to your contacts’ phone numbers to make suggestions about possible contacts who are already on Quicksy.<br><br>We will not store a copy of those phone numbers.\n\nFor more information read our <a href="https://quicksy.im/#privacy">privacy policy</a>.<br><br>You will now be asked to grant permission to access your contacts.]]></string>
|
<string name="sync_with_contacts_quicksy"><![CDATA[Quicksy needs access to your contacts’ phone numbers to make suggestions about possible contacts who are already on Quicksy.<br><br>We will not store a copy of those phone numbers.\n\nFor more information read our <a href="https://quicksy.im/#privacy">privacy policy</a>.<br><br>You will now be asked to grant permission to access your contacts.]]></string>
|
||||||
<string name="notify_on_all_messages">Notify on all messages</string>
|
<string name="notify_on_all_messages">Notify on all messages</string>
|
||||||
<string name="notify_only_when_highlighted">Notify only when mentioned</string>
|
<string name="notify_only_when_highlighted">Notify only when mentioned</string>
|
||||||
|
|
Loading…
Reference in New Issue