Merge pull request #8295 from vector-im/feature/fga/acceptable_use_policy

Replace Terms and Conditions with Acceptable Use Policy.

Author: ganfra

changelog.d/8286.misc

@@ -0,0 +1 @@
+Replace Terms and Conditions with Acceptable Use Policy.

library/ui-strings/src/main/res/values/strings.xml

@@ -1002,6 +1002,7 @@
     <string name="settings_version">Version</string>
     <string name="settings_olm_version">olm version</string>
     <string name="settings_app_term_conditions">Terms &amp; conditions</string>
+    <string name="settings_acceptable_use_policy">Acceptable Use Policy</string>
     <string name="settings_third_party_notices">Third party notices</string>
     <string name="settings_copyright">Copyright</string>
     <string name="settings_privacy_policy">Privacy policy</string>

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"

vector/src/main/java/im/vector/app/features/settings/legals/ElementLegals.kt

@@ -31,7 +31,7 @@ class ElementLegals @Inject constructor(
     fun getData(): List<ServerPolicy> {
         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)
         )
     }