From d1f14db00ba22048520a7098d468b74436cd4ce6 Mon Sep 17 00:00:00 2001 From: Yamil Medina Date: Wed, 3 Jul 2024 09:25:19 +0000 Subject: [PATCH 1/2] fix: cherrypick terms of use copy (WPB-8846) (#3154) --- .../kotlin/com/wire/android/navigation/OtherDestinations.kt | 2 +- app/src/main/res/values-de/strings.xml | 2 +- app/src/main/res/values/strings.xml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/kotlin/com/wire/android/navigation/OtherDestinations.kt b/app/src/main/kotlin/com/wire/android/navigation/OtherDestinations.kt index b8cb41d8f8d..336c2211722 100644 --- a/app/src/main/kotlin/com/wire/android/navigation/OtherDestinations.kt +++ b/app/src/main/kotlin/com/wire/android/navigation/OtherDestinations.kt @@ -64,7 +64,7 @@ object PrivacyPolicyScreenDestination : ExternalUriStringResDirection { object TermsOfUseScreenDestination : ExternalUriStringResDirection { override val uriStringRes: Int - get() = R.string.url_terms_of_use + get() = R.string.url_terms_of_use_legal } object GiveFeedbackDestination : IntentDirection { diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index ada34110c47..d5fb1aacb50 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -925,7 +925,7 @@ Kontodetails App-Einstellungen Datenschutzerklärung - Nutzungsbedingungen + Datenschutz und AGB Netzwerkeinstellungen Geräte verwalten Verbindung zu Websocket behalten diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 4b5d7dfc4f4..1875e14ecc9 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -189,7 +189,7 @@ https://medium.com/feed/wire-news/tagged/android http://maps.google.com/maps?z=%1d&q=loc:%2f+%2f https://wire.com/privacy-policy#:~:text=We%20process%20individual%20data%20about,%C2%A7%201%20a)%20GDPR). - https://wire.com/legal#:~:text=Wire%20is%20used%20for%20private,disable%20your%20access%20to%20Wire. + https://wire.com/legal Vault Archive @@ -202,7 +202,7 @@ Report Bug About This App Privacy Policy - Terms of Use + Legal Copyright © Wire Swiss GmbH Debug Settings From 381d6f2e5128601699847bd46880c7c6ec3dc977 Mon Sep 17 00:00:00 2001 From: yamilmedina Date: Wed, 3 Jul 2024 11:46:31 +0200 Subject: [PATCH 2/2] chore: empty commit bump