Merge pull request #799 from minvws/2114-leave-flag-empty-if-no-valid…

…-country-is-provided don't show anything if locale from country code is not valid
minvws · Oct 28, 2021 · de4f510 · de4f510
2 parents 3cfacee + a58e8d5
commit de4f510
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/shared/src/main/java/nl/rijksoverheid/ctr/shared/ext/LocaleExt.kt b/shared/src/main/java/nl/rijksoverheid/ctr/shared/ext/LocaleExt.kt
@@ -13,5 +13,13 @@ val Locale.flagEmoji: String
     get() {
         val firstLetter = Character.codePointAt(country, 0) - 0x41 + 0x1F1E6
         val secondLetter = Character.codePointAt(country, 1) - 0x41 + 0x1F1E6
-        return String(Character.toChars(firstLetter)) + String(Character.toChars(secondLetter))
+
+        // check if the locale created by the country code provided
+        // is valid. if it is not, we leave it empty
+        return try {
+            isO3Country
+            String(Character.toChars(firstLetter)) + String(Character.toChars(secondLetter))
+        } catch (exception: MissingResourceException) {
+            ""
+        }
     }
diff --git a/...c/main/java/nl/rijksoverheid/ctr/verifier/ui/scanner/ScanResultPersonalDetailsFragment.kt b/...c/main/java/nl/rijksoverheid/ctr/verifier/ui/scanner/ScanResultPersonalDetailsFragment.kt
@@ -98,11 +98,14 @@ class ScanResultPersonalDetailsFragment :
         binding.personalDetailsBirthdate.setContent(personalDetails.birthDay)
         if (testResultAttributes.isInternationalDCC()) {
             binding.internationalDescription.visibility = View.VISIBLE
+            val dccLocale = Locale("", testResultAttributes.issuerCountryCode)
             val text = getString(
                 R.string.scan_result_valid_international_scanned,
-                Locale("", testResultAttributes.issuerCountryCode).flagEmoji
+                dccLocale.flagEmoji
             )
-            binding.internationalDescription.text = increasedSizeFlagEmoji(text)
+            if (dccLocale.flagEmoji.isNotEmpty()) {
+                binding.internationalDescription.text = increasedSizeFlagEmoji(text)
+            }
         }
     }