Skip to content

Replace Terms and Conditions with Acceptable Use Policy. #8295

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ganfra merged 1 commit into from
Mar 31, 2023
Merged

Replace Terms and Conditions with Acceptable Use Policy. #8295

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/8286.misc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Replace Terms and Conditions with Acceptable Use Policy.
1 change: 1 addition & 0 deletions library/ui-strings/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion vector/src/main/java/im/vector/app/features/settings/VectorSettingsUrls.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion vector/src/main/java/im/vector/app/features/settings/legals/ElementLegals.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
)
}
Expand Down