From 8f51de45d0332d05fad3d93ca17a08f34a6cebd4 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Mon, 18 Sep 2023 11:11:37 +0200 Subject: [PATCH] Updated links --- .../ui/assistant/fragment/LoginFragment.kt | 6 +++--- .../ui/assistant/fragment/RegisterFragment.kt | 2 +- .../ThirdPartySipAccountWarningFragment.kt | 2 +- .../ui/main/contacts/fragment/ContactFragment.kt | 2 +- .../ui/main/help/fragment/HelpFragment.kt | 6 +++--- app/src/main/res/values/strings.xml | 15 ++++++++------- 6 files changed, 17 insertions(+), 16 deletions(-) diff --git a/app/src/main/java/org/linphone/ui/assistant/fragment/LoginFragment.kt b/app/src/main/java/org/linphone/ui/assistant/fragment/LoginFragment.kt index 886928e4f..8eae75d32 100644 --- a/app/src/main/java/org/linphone/ui/assistant/fragment/LoginFragment.kt +++ b/app/src/main/java/org/linphone/ui/assistant/fragment/LoginFragment.kt @@ -82,7 +82,7 @@ class LoginFragment : Fragment() { } binding.setForgottenPasswordClickListener { - val url = getString(R.string.users_web_platform) + val url = getString(R.string.web_platform_forgotten_password_url) try { val browserIntent = Intent(Intent.ACTION_VIEW, Uri.parse(url)) startActivity(browserIntent) @@ -187,7 +187,7 @@ class LoginFragment : Fragment() { model.privacyPolicyClickedEvent.observe(viewLifecycleOwner) { it.consume { - val url = getString(R.string.privacy_policy_url) + val url = getString(R.string.website_privacy_policy_url) try { val browserIntent = Intent(Intent.ACTION_VIEW, Uri.parse(url)) startActivity(browserIntent) @@ -201,7 +201,7 @@ class LoginFragment : Fragment() { model.generalTermsClickedEvent.observe(viewLifecycleOwner) { it.consume { - val url = getString(R.string.terms_and_conditions_url) + val url = getString(R.string.website_terms_and_conditions_url) try { val browserIntent = Intent(Intent.ACTION_VIEW, Uri.parse(url)) startActivity(browserIntent) diff --git a/app/src/main/java/org/linphone/ui/assistant/fragment/RegisterFragment.kt b/app/src/main/java/org/linphone/ui/assistant/fragment/RegisterFragment.kt index 0b015c778..c6b3b81b9 100644 --- a/app/src/main/java/org/linphone/ui/assistant/fragment/RegisterFragment.kt +++ b/app/src/main/java/org/linphone/ui/assistant/fragment/RegisterFragment.kt @@ -85,7 +85,7 @@ class RegisterFragment : Fragment() { } binding.setOpenSubscribeWebPageClickListener { - val url = getString(R.string.users_web_platform) + val url = getString(R.string.web_platform_register_email_url) try { val browserIntent = Intent(Intent.ACTION_VIEW, Uri.parse(url)) startActivity(browserIntent) diff --git a/app/src/main/java/org/linphone/ui/assistant/fragment/ThirdPartySipAccountWarningFragment.kt b/app/src/main/java/org/linphone/ui/assistant/fragment/ThirdPartySipAccountWarningFragment.kt index 39b783fa4..012abc052 100644 --- a/app/src/main/java/org/linphone/ui/assistant/fragment/ThirdPartySipAccountWarningFragment.kt +++ b/app/src/main/java/org/linphone/ui/assistant/fragment/ThirdPartySipAccountWarningFragment.kt @@ -59,7 +59,7 @@ class ThirdPartySipAccountWarningFragment : Fragment() { } binding.setContactClickListener { - val url = getString(R.string.website_contact_page) + val url = getString(R.string.website_contact_url) try { val browserIntent = Intent(Intent.ACTION_VIEW, Uri.parse(url)) startActivity(browserIntent) diff --git a/app/src/main/java/org/linphone/ui/main/contacts/fragment/ContactFragment.kt b/app/src/main/java/org/linphone/ui/main/contacts/fragment/ContactFragment.kt index 5e81d751c..d03d1fe49 100644 --- a/app/src/main/java/org/linphone/ui/main/contacts/fragment/ContactFragment.kt +++ b/app/src/main/java/org/linphone/ui/main/contacts/fragment/ContactFragment.kt @@ -250,7 +250,7 @@ class ContactFragment : GenericFragment() { val smsBody = getString( R.string.contact_sms_invite_content, - getString(R.string.website_download_page) + getString(R.string.website_download_url) ) val smsIntent: Intent = Intent().apply { action = Intent.ACTION_SENDTO diff --git a/app/src/main/java/org/linphone/ui/main/help/fragment/HelpFragment.kt b/app/src/main/java/org/linphone/ui/main/help/fragment/HelpFragment.kt index 165f44113..d34086c6f 100644 --- a/app/src/main/java/org/linphone/ui/main/help/fragment/HelpFragment.kt +++ b/app/src/main/java/org/linphone/ui/main/help/fragment/HelpFragment.kt @@ -52,7 +52,7 @@ class HelpFragment : GenericFragment() { } binding.setPrivacyPolicyClickListener { - val url = getString(R.string.privacy_policy_url) + val url = getString(R.string.website_privacy_policy_url) try { val browserIntent = Intent(Intent.ACTION_VIEW, Uri.parse(url)) startActivity(browserIntent) @@ -64,7 +64,7 @@ class HelpFragment : GenericFragment() { } binding.setLicensesClickListener { - val url = getString(R.string.open_source_licences_usage_url) + val url = getString(R.string.website_open_source_licences_usage_url) try { val browserIntent = Intent(Intent.ACTION_VIEW, Uri.parse(url)) startActivity(browserIntent) @@ -76,7 +76,7 @@ class HelpFragment : GenericFragment() { } binding.setTranslateClickListener { - val url = getString(R.string.translate_weblate_url) + val url = getString(R.string.website_translate_weblate_url) try { val browserIntent = Intent(Intent.ACTION_VIEW, Uri.parse(url)) startActivity(browserIntent) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 7989acce5..94d1cde2e 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -19,13 +19,14 @@ © Belledonne Communications 2010-2023 linphone-android@belledonne-communications.com - https://linphone.org/contact - https://linphone.org/download - https://linphone.org/privacy-policy - https://linphone.org/general-terms - https://subscribe.linphone.org - https://weblate.linphone.org/ - https://wiki.linphone.org/xwiki/wiki/public/view/Linphone/Third%20party%20components%20/#Hlinphone-android + https://linphone.org/contact + https://linphone.org/download + https://linphone.org/privacy-policy + https://linphone.org/general-terms + https://subscribe.linphone.org/register/email + https://subscribe.linphone.org/ + https://weblate.linphone.org/ + https://wiki.linphone.org/xwiki/wiki/public/view/Linphone/Third%20party%20components%20/#Hlinphone-android SIP address Display name