From 3d93fb2bc18903355c0a45c4935dc69d3191eded Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Mon, 17 Apr 2023 11:02:19 +0200
Subject: [PATCH] Fixed wrong format in some translated string + added
 try/catch to prevent a future one from making the app crash

---
 .../assistant/fragments/WelcomeFragment.kt       | 16 +++++++++++-----
 app/src/main/res/values-fi/strings.xml           |  2 +-
 app/src/main/res/values-he/strings.xml           |  2 +-
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/org/linphone/activities/assistant/fragments/WelcomeFragment.kt b/app/src/main/java/org/linphone/activities/assistant/fragments/WelcomeFragment.kt
index 07dd1a0ea..5de3720b7 100644
--- a/app/src/main/java/org/linphone/activities/assistant/fragments/WelcomeFragment.kt
+++ b/app/src/main/java/org/linphone/activities/assistant/fragments/WelcomeFragment.kt
@@ -38,6 +38,7 @@ import org.linphone.activities.navigateToEmailAccountCreation
 import org.linphone.activities.navigateToRemoteProvisioning
 import org.linphone.core.tools.Log
 import org.linphone.databinding.AssistantWelcomeFragmentBinding
+import java.util.UnknownFormatConversionException
 
 class WelcomeFragment : GenericFragment<AssistantWelcomeFragmentBinding>() {
     private lateinit var viewModel: WelcomeViewModel
@@ -85,11 +86,16 @@ class WelcomeFragment : GenericFragment<AssistantWelcomeFragmentBinding>() {
         val terms = getString(R.string.assistant_general_terms)
         val privacy = getString(R.string.assistant_privacy_policy)
 
-        val label = getString(
-            R.string.assistant_read_and_agree_terms,
-            terms,
-            privacy
-        )
+        val label = try {
+            getString(
+                R.string.assistant_read_and_agree_terms,
+                terms,
+                privacy
+            )
+        } catch (e: UnknownFormatConversionException) {
+            Log.e("[Welcome] Wrong R.string.assistant_read_and_agree_terms format!")
+            "I accept Belledonne Communications' terms of use and privacy policy"
+        }
         val spannable = SpannableString(label)
 
         val termsMatcher = Pattern.compile(terms).matcher(label)
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index e85166de3..9e8ee3207 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -331,7 +331,7 @@
 \n
 \nNäet osoitekirjastasi kuka käyttää &appName; ja ystäväsi tietävät myös, että voivat ottaa yhteyttä käyttäen &appName;.
 \n"</string>
-    <string name="assistant_read_and_agree_terms">Hyväksyn Belledonne Communications:n %1$:n ja %2$:n</string>
+    <string name="assistant_read_and_agree_terms">Hyväksyn Belledonne Communications:n %1$s:n ja %2$s:n</string>
     <string name="assistant_generic_account_warning_continue_button_text">Ymmärrän</string>
     <string name="assistant_error_phone_number_invalid_characters">Vain numerot ovat sallittuja</string>
     <string name="assistant_error_username_already_exists">Käyttäjätunnus on jo käytössä</string>
diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml
index b5e01c501..082827297 100644
--- a/app/src/main/res/values-he/strings.xml
+++ b/app/src/main/res/values-he/strings.xml
@@ -225,7 +225,7 @@
     <string name="assistant_remote_provisioning">קבל הגדרות מרחוק</string>
     <string name="assistant_ec_calibration">מכייל ביטול הד</string>
     <string name="assistant_phone_number_info_title">למה מספר הטלפון שלי ישמש\?</string>
-    <string name="assistant_read_and_agree_terms">אני מסכים ל%1$ ו %2$ של \"Belledonne Communications\"</string>
+    <string name="assistant_read_and_agree_terms">אני מסכים ל%1$s ו %2$s של \"Belledonne Communications\"</string>
     <string name="assistant_error_phone_number_invalid_characters">מותר מספרים בלבד</string>
     <string name="assistant_error_username_already_exists">משתמש בשימוש</string>
     <string name="assistant_error_phone_number_already_exists">כבר קיים חשבון המשתמש במספר זה</string>