Fix GB location UI

network-protection/network-protection-impl/src/main/java/com/duckduckgo/networkprotection/impl/settings/geoswitching/CountryUtils.kt

@@ -18,17 +18,30 @@ package com.duckduckgo.networkprotection.impl.settings.geoswitching
 
 import java.util.*
 
+private const val REGIONAL_INDICATOR_OFFSET = 0x1F1A5
+
+/*
+ * The regional indicators go from 0x1F1E6 (A) to 0x1F1FF (Z).
+ * This is the A regional indicator value minus 65 decimal so
+ * that we can just add this to the A-Z char
+ */
 internal fun getEmojiForCountryCode(countryCode: String): String {
-    return when (countryCode) {
-        "uk" -> "🇬🇧"
-        "fr" -> "🇫🇷"
-        "ca" -> "🇨🇦"
-        "us" -> "🇺🇸"
-        "de" -> "🇩🇪"
-        "es" -> "🇪🇸"
-        "nl" -> "🇳🇱"
-        else -> "🏳️"
+    @Suppress("NAME_SHADOWING")
+    val countryCode = countryCode.uppercase()
+
+    if (countryCode.isBlank()) return "🏳️"
+    if (countryCode.length > 2) return "🏳️"
+    val (first, second) = countryCode.toCharArray().run {
+        this[0] to this[1]
     }
+    if (first < 'A' || first > 'Z') return "🏳️"
+    if (second < 'A' || second > 'Z') return "🏳️"
+
+    return countryCode.uppercase()
+        .split("")
+        .filter { it.isNotBlank() }
+        .map { it.codePointAt(0) + REGIONAL_INDICATOR_OFFSET }
+        .joinToString("") { String(Character.toChars(it)) }
 }
 
 internal fun getDisplayableCountry(countryCode: String): String {

network-protection/network-protection-impl/src/test/java/com/duckduckgo/networkprotection/impl/settings/geoswitching/CountryUtilsKtTest.kt

@@ -0,0 +1,33 @@
+package com.duckduckgo.networkprotection.impl.settings.geoswitching
+
+import org.junit.Assert.assertEquals
+import org.junit.Test
+
+class CountryUtilsTest {
+
+    @Test
+    fun testEmojiForCountryCode() {
+        assertEquals("🇬🇧", getEmojiForCountryCode("gb"))
+        assertEquals("🇬🇧", getEmojiForCountryCode("GB"))
+
+        assertEquals("🇫🇷", getEmojiForCountryCode("fr"))
+        assertEquals("🇫🇷", getEmojiForCountryCode("FR"))
+
+        assertEquals("🇨🇦", getEmojiForCountryCode("ca"))
+        assertEquals("🇨🇦", getEmojiForCountryCode("CA"))
+
+        assertEquals("🇺🇸", getEmojiForCountryCode("us"))
+        assertEquals("🇺🇸", getEmojiForCountryCode("US"))
+
+        assertEquals("🇩🇪", getEmojiForCountryCode("de"))
+        assertEquals("🇩🇪", getEmojiForCountryCode("DE"))
+
+        assertEquals("🇪🇸", getEmojiForCountryCode("es"))
+        assertEquals("🇪🇸", getEmojiForCountryCode("ES"))
+
+        assertEquals("🇳🇱", getEmojiForCountryCode("nl"))
+        assertEquals("🇳🇱", getEmojiForCountryCode("NL"))
+
+        assertEquals("🏳️", getEmojiForCountryCode(""))
+    }
+}

network-protection/network-protection-impl/src/test/java/com/duckduckgo/networkprotection/impl/settings/geoswitching/FakeNetpEgressServersProvider.kt

@@ -32,7 +32,7 @@ class FakeNetpEgressServersProvider : NetpEgressServersProvider {
                 cities = listOf("El Segundo", "Chicago", "Atlanta", "Newark"),
             ),
             ServerLocation(
-                countryCode = "uk",
+                countryCode = "gb",
                 countryName = "UK",
                 cities = emptyList(),
             ),

network-protection/network-protection-impl/src/test/java/com/duckduckgo/networkprotection/impl/settings/geoswitching/NetpGeoSwitchingViewModelTest.kt

@@ -92,7 +92,7 @@ class NetpGeoSwitchingViewModelTest {
                 assertEquals(
                     it.items[4],
                     CountryItem(
-                        countryCode = "uk",
+                        countryCode = "gb",
                         countryEmoji = "🇬🇧",
                         countryName = "UK",
                         cities = emptyList(),