mobile/element-android
mobile/element-android
1
0
Fork 0
mirror of https://github.com/element-hq/element-android synced 2024-07-22 02:24:39 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

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

Browse source 
Replace Terms and Conditions with Acceptable Use Policy.
This commit is contained in:
ganfra 2023-03-31 15:22:03 +02:00 committed by GitHub
parent 93cd197c78 ac65defe56
commit c94ee5c6fe
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog.d/8286.misc Normal file
View file

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

1
library/ui-strings/src/main/res/values/strings.xml
View file

@ -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>

2
vector/src/main/java/im/vector/app/features/settings/VectorSettingsUrls.kt
View file

@ -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"

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

@ -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)
)
}