From 14538a71d0858b4aac072da8f635d2249ac5f892 Mon Sep 17 00:00:00 2001
From: Adam Brown <adampsbrown@gmail.com>
Date: Thu, 28 Oct 2021 15:56:08 +0100
Subject: [PATCH] updating consent copy to use latest variation

---
 vector/src/main/java/im/vector/app/core/utils/Dialogs.kt        | 2 +-
 .../app/features/discovery/DiscoverySettingsController.kt       | 2 +-
 .../im/vector/app/features/userdirectory/UserListController.kt  | 2 +-
 vector/src/main/res/values/strings.xml                          | 2 ++
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/core/utils/Dialogs.kt b/vector/src/main/java/im/vector/app/core/utils/Dialogs.kt
index ed3ae00567..a89eefa4a0 100644
--- a/vector/src/main/java/im/vector/app/core/utils/Dialogs.kt
+++ b/vector/src/main/java/im/vector/app/core/utils/Dialogs.kt
@@ -43,7 +43,7 @@ fun Context.displayInWebView(url: String) {
 fun Context.showIdentityServerConsentDialog(configuredIdentityServer: String?, policyLinkCallback: () -> Unit, consentCallBack: (() -> Unit)) {
     MaterialAlertDialogBuilder(this)
             .setTitle(R.string.identity_server_consent_dialog_title)
-            .setMessage(getString(R.string.identity_server_consent_dialog_content, configuredIdentityServer ?: ""))
+            .setMessage(getString(R.string.identity_server_consent_dialog_content_2, configuredIdentityServer ?: ""))
             .setPositiveButton(R.string.yes) { _, _ ->
                 consentCallBack.invoke()
             }
diff --git a/vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsController.kt b/vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsController.kt
index d8c67592f1..03c5d981cb 100644
--- a/vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsController.kt
+++ b/vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsController.kt
@@ -95,7 +95,7 @@ class DiscoverySettingsController @Inject constructor(
         } else {
             settingsInfoItem {
                 id("idConsentInfo")
-                helperTextResId(R.string.settings_discovery_consent_notice_off)
+                helperTextResId(R.string.settings_discovery_consent_notice_off_2)
             }
             settingsButtonItem {
                 id("idConsentButton")
diff --git a/vector/src/main/java/im/vector/app/features/userdirectory/UserListController.kt b/vector/src/main/java/im/vector/app/features/userdirectory/UserListController.kt
index 147367c1da..2028e59073 100644
--- a/vector/src/main/java/im/vector/app/features/userdirectory/UserListController.kt
+++ b/vector/src/main/java/im/vector/app/features/userdirectory/UserListController.kt
@@ -146,7 +146,7 @@ class UserListController @Inject constructor(private val session: Session,
                             text(
                                     span {
                                         span {
-                                            text = host.stringProvider.getString(R.string.settings_discovery_consent_notice_off)
+                                            text = host.stringProvider.getString(R.string.settings_discovery_consent_notice_off_2)
                                         }
                                         +"\n"
                                         span {
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index 274753ee3f..c2ddc3321c 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -2363,11 +2363,13 @@
     <string name="settings_discovery_consent_title">Send emails and phone numbers</string>
     <string name="settings_discovery_consent_notice_on">You have given your consent to send emails and phone numbers to this identity server to discover other users from your contacts.</string>
     <string name="settings_discovery_consent_notice_off">You have not given your consent to send emails and phone numbers to this identity server to discover other users from your contacts.</string>
+    <string name="settings_discovery_consent_notice_off_2">Your contacts are private. You\'ll need to share your contact info to find people you know.</string>
     <string name="settings_discovery_consent_action_revoke">Revoke my consent</string>
     <string name="settings_discovery_consent_action_give_consent">Give consent</string>
 
     <string name="identity_server_consent_dialog_title">Send emails and phone numbers</string>
     <string name="identity_server_consent_dialog_content">In order to discover existing contacts you know, do you accept to send your contact data (phone numbers and/or emails) to the configured identity server (%1$s)?\n\nFor more privacy, the sent data will be hashed before being sent.</string>
+    <string name="identity_server_consent_dialog_content_2">Your contacts can\'t find you, and you can\'t find them. In order to see each other you must share your contact info with your identity server (%s).\n\nYour data will be sent securely.</string>
     <string name="identity_server_consent_dialog_neutral_policy">Policy</string>
 
     <string name="settings_discovery_enter_identity_server">Enter an identity server URL</string>