mirror of
https://github.com/SchildiChat/SchildiChat-android.git
synced 2025-02-08 08:08:45 +01:00
updating consent copy to use latest variation
This commit is contained in:
parent
10df75bd57
commit
14538a71d0
@ -43,7 +43,7 @@ fun Context.displayInWebView(url: String) {
|
|||||||
fun Context.showIdentityServerConsentDialog(configuredIdentityServer: String?, policyLinkCallback: () -> Unit, consentCallBack: (() -> Unit)) {
|
fun Context.showIdentityServerConsentDialog(configuredIdentityServer: String?, policyLinkCallback: () -> Unit, consentCallBack: (() -> Unit)) {
|
||||||
MaterialAlertDialogBuilder(this)
|
MaterialAlertDialogBuilder(this)
|
||||||
.setTitle(R.string.identity_server_consent_dialog_title)
|
.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) { _, _ ->
|
.setPositiveButton(R.string.yes) { _, _ ->
|
||||||
consentCallBack.invoke()
|
consentCallBack.invoke()
|
||||||
}
|
}
|
||||||
|
@ -95,7 +95,7 @@ class DiscoverySettingsController @Inject constructor(
|
|||||||
} else {
|
} else {
|
||||||
settingsInfoItem {
|
settingsInfoItem {
|
||||||
id("idConsentInfo")
|
id("idConsentInfo")
|
||||||
helperTextResId(R.string.settings_discovery_consent_notice_off)
|
helperTextResId(R.string.settings_discovery_consent_notice_off_2)
|
||||||
}
|
}
|
||||||
settingsButtonItem {
|
settingsButtonItem {
|
||||||
id("idConsentButton")
|
id("idConsentButton")
|
||||||
|
@ -146,7 +146,7 @@ class UserListController @Inject constructor(private val session: Session,
|
|||||||
text(
|
text(
|
||||||
span {
|
span {
|
||||||
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"
|
+"\n"
|
||||||
span {
|
span {
|
||||||
|
@ -2363,11 +2363,13 @@
|
|||||||
<string name="settings_discovery_consent_title">Send emails and phone numbers</string>
|
<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_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">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_revoke">Revoke my consent</string>
|
||||||
<string name="settings_discovery_consent_action_give_consent">Give 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_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">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="identity_server_consent_dialog_neutral_policy">Policy</string>
|
||||||
|
|
||||||
<string name="settings_discovery_enter_identity_server">Enter an identity server URL</string>
|
<string name="settings_discovery_enter_identity_server">Enter an identity server URL</string>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user