From ac65defe56b5dd2b4a78e0924a9f7a57b040c822 Mon Sep 17 00:00:00 2001 From: ganfra Date: Thu, 30 Mar 2023 20:41:05 +0200 Subject: [PATCH] Replace Terms and Conditions with Acceptable Use Policy. --- changelog.d/8286.misc | 1 + library/ui-strings/src/main/res/values/strings.xml | 1 + .../java/im/vector/app/features/settings/VectorSettingsUrls.kt | 2 +- .../im/vector/app/features/settings/legals/ElementLegals.kt | 2 +- 4 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 changelog.d/8286.misc diff --git a/changelog.d/8286.misc b/changelog.d/8286.misc new file mode 100644 index 0000000000..14a166b254 --- /dev/null +++ b/changelog.d/8286.misc @@ -0,0 +1 @@ +Replace Terms and Conditions with Acceptable Use Policy. diff --git a/library/ui-strings/src/main/res/values/strings.xml b/library/ui-strings/src/main/res/values/strings.xml index 439479151c..a4e576fe60 100644 --- a/library/ui-strings/src/main/res/values/strings.xml +++ b/library/ui-strings/src/main/res/values/strings.xml @@ -1002,6 +1002,7 @@ Version olm version Terms & conditions + Acceptable Use Policy Third party notices Copyright Privacy policy diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsUrls.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsUrls.kt index 09249c4957..09b60fc7b8 100644 --- a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsUrls.kt +++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsUrls.kt @@ -19,7 +19,7 @@ package im.vector.app.features.settings object VectorSettingsUrls { const val HELP = "https://element.io/help" const val COPYRIGHT = "https://element.io/copyright" - const val TAC = "https://element.io/terms-of-service" + const val ACCEPTABLE_USE_POLICY = "https://element.io/acceptable-use-policy-terms" const val PRIVACY_POLICY = "https://element.io/privacy" const val DISCLAIMER_URL = "https://element.io/previously-riot" const val THIRD_PARTY_LICENSES = "file:///android_asset/open_source_licenses.html" diff --git a/vector/src/main/java/im/vector/app/features/settings/legals/ElementLegals.kt b/vector/src/main/java/im/vector/app/features/settings/legals/ElementLegals.kt index 9f01dea4c1..0dcea1433a 100644 --- a/vector/src/main/java/im/vector/app/features/settings/legals/ElementLegals.kt +++ b/vector/src/main/java/im/vector/app/features/settings/legals/ElementLegals.kt @@ -31,7 +31,7 @@ class ElementLegals @Inject constructor( fun getData(): List { return listOf( ServerPolicy(stringProvider.getString(R.string.settings_copyright), VectorSettingsUrls.COPYRIGHT), - ServerPolicy(stringProvider.getString(R.string.settings_app_term_conditions), VectorSettingsUrls.TAC), + ServerPolicy(stringProvider.getString(R.string.settings_acceptable_use_policy), VectorSettingsUrls.ACCEPTABLE_USE_POLICY), ServerPolicy(stringProvider.getString(R.string.settings_privacy_policy), VectorSettingsUrls.PRIVACY_POLICY) ) }