@@ -96,6 +96,14 @@ All notable changes to CallShield will be documented in this file.
   that, so a tap on a list's name can't take its numbers out. A list you remove
   can be put back with Undo right afterwards, numbers included, without
   downloading it again.
+- Region rules can allow countries outside North America. Add a country by
+  its calling code, like +39 for Italy or +57 for Colombia, next to the
+  two-letter state and province codes. A Caribbean country that shares +1
+  goes in by area code, so the Dominican Republic is +1809. Two-letter codes
+  always mean the state or province, and CO is Colorado, never Colombia.
+- Region rules no longer mistake a ten-digit number from outside North America
+  for a North American one. A Penang landline (+60 4) counted as Vancouver's
+  604 area code, so allowing British Columbia let it ring.
 
 ### Interface
 
 
@@ -102,7 +102,7 @@ All detection layers implement a shared `IChecker` interface and run in priority
 |  4850 | **Caller Name Trust** | Allow | Carrier-presented name matches one of your trust patterns (requires the device to provide a name during screening) |
 |  4700 | **Push-Alert Bridge** (A3) | Allow | Uber/DoorDash/Amazon/Gmail notification about an arriving call? Let it through |
 |  4500 | *Campaign Recorder* |. | Side-effect only; feeds burst detection below |
-|  4300 | **Region Rules** | Block | Opt-in offline blocking outside your selected US/Canadian regions |
+|  4300 | **Region Rules** | Block | Opt-in offline blocking outside the US/Canadian regions and country calling codes you allow |
 |  4000 | **Quiet Hours** | Block | Block all non-contact calls during configurable hours (calls only) |
 |  3500 | **Frequency Auto-Block** | Block | Numbers that call 3+ times in 7 days get auto-blocked |
 |  3000 | **Heuristic Engine** | Block | VoIP ranges, neighbor spoofing, rapid-fire detection, 30+ rules |
 
@@ -3,6 +3,7 @@ package com.sysadmindoc.callshield.data
 import android.content.Context
 import com.sysadmindoc.callshield.data.remote.HttpClient
 import com.sysadmindoc.callshield.service.CommunityReportWorker
+import com.sysadmindoc.callshield.util.countryCallingCodeOf
 import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
@@ -310,35 +311,13 @@ object CommunityContributor {
      * in step so app reports and issue-filed reports land on the same key.
      */
     internal fun stripNationalTrunkPrefix(digits: String): String {
-        val countryCode =
-            when {
-                digits.isEmpty() -> return digits
-                digits.take(1) in ONE_DIGIT_COUNTRY_CODES -> digits.take(1)
-                digits.take(2) in TWO_DIGIT_COUNTRY_CODES -> digits.take(2)
-                digits.length >= 3 -> digits.take(3)
-                else -> return digits
-            }
+        val countryCode = countryCallingCodeOf(digits) ?: return digits
         if (countryCode in TRUNK_ZERO_SIGNIFICANT_COUNTRY_CODES) return digits
         val national = digits.drop(countryCode.length).trimStart('0')
         // An all-zero national part is junk; leave it for the length check to reject.
         return if (national.isEmpty()) digits else countryCode + national
     }
 
-    /** Every assigned one/two-digit ITU-T E.164 country calling code. Calling codes are
-     *  prefix-free, so anything not matching these is a three-digit code. */
-    private val ONE_DIGIT_COUNTRY_CODES = setOf("1", "7")
-
-    private val TWO_DIGIT_COUNTRY_CODES =
-        (
-            "20 27 " +
-                "30 31 32 33 34 36 39 " +
-                "40 41 43 44 45 46 47 48 49 " +
-                "51 52 53 54 55 56 57 58 " +
-                "60 61 62 63 64 65 66 " +
-                "81 82 84 86 " +
-                "90 91 92 93 94 95 98"
-        ).split(" ").toSet()
-
     /** Countries whose national significant numbers genuinely keep a leading 0 in
      *  E.164 — stripping it there would corrupt the number, not repair it:
      *  +39 Italy (and Vatican City, which splits under 39): +39 06 … is correct
 
@@ -1,13 +1,20 @@
 package com.sysadmindoc.callshield.data
 
 import com.sysadmindoc.callshield.data.areacodes.AreaCodeLookup
+import com.sysadmindoc.callshield.util.countryCallingCodeOf
+import com.sysadmindoc.callshield.util.filterAsciiDigits
+import com.sysadmindoc.callshield.util.isAsciiDigit
 import java.util.Locale
 
 /** Pure, bounded matching helpers for the regional and carrier-name rules. */
 object RegionRules {
     const val MAX_ALLOWED_REGIONS = 64
     const val MAX_NAME_PATTERNS = 30
     const val MAX_NAME_PATTERN_LENGTH = 60
+    private const val NANP_NATIONAL_LENGTH = 10
+
+    /** `1` plus a three-digit area code, as in `+1809`. */
+    private const val NANP_AREA_CODE_ENTRY_LENGTH = 4
 
     val supportedRegionCodes: Set<String> =
         setOf(
@@ -76,104 +83,33 @@ object RegionRules {
             "TF",
         )
 
-    private val countryCallingCodes: Map<String, String> =
-        mapOf(
-            "AF" to "+93",
-            "AL" to "+355",
-            "DZ" to "+213",
-            "AR" to "+54",
-            "AU" to "+61",
-            "AT" to "+43",
-            "BD" to "+880",
-            "BE" to "+32",
-            "BR" to "+55",
-            "BG" to "+359",
-            "KH" to "+855",
-            "CM" to "+237",
-            "CL" to "+56",
-            "CN" to "+86",
-            "CO" to "+57",
-            "HR" to "+385",
-            "CZ" to "+420",
-            "DK" to "+45",
-            "EG" to "+20",
-            "FI" to "+358",
-            "FR" to "+33",
-            "DE" to "+49",
-            "GH" to "+233",
-            "GR" to "+30",
-            "HK" to "+852",
-            "HU" to "+36",
-            "IN" to "+91",
-            "ID" to "+62",
-            "IR" to "+98",
-            "IQ" to "+964",
-            "IE" to "+353",
-            "IL" to "+972",
-            "IT" to "+39",
-            "JP" to "+81",
-            "JO" to "+962",
-            "KE" to "+254",
-            "KR" to "+82",
-            "KW" to "+965",
-            "MY" to "+60",
-            "MX" to "+52",
-            "MA" to "+212",
-            "NL" to "+31",
-            "NZ" to "+64",
-            "NG" to "+234",
-            "NO" to "+47",
-            "PK" to "+92",
-            "PE" to "+51",
-            "PH" to "+63",
-            "PL" to "+48",
-            "PT" to "+351",
-            "RO" to "+40",
-            "RU" to "+7",
-            "SA" to "+966",
-            "SG" to "+65",
-            "ZA" to "+27",
-            "ES" to "+34",
-            "SE" to "+46",
-            "CH" to "+41",
-            "TW" to "+886",
-            "TH" to "+66",
-            "TR" to "+90",
-            "UA" to "+380",
-            "AE" to "+971",
-            "GB" to "+44",
-            "VN" to "+84",
-            "EC" to "+593",
-            "VE" to "+58",
-            "UY" to "+598",
-            "PY" to "+595",
-            "BO" to "+591",
-            "PA" to "+507",
-            "CR" to "+506",
-            "GT" to "+502",
-            "HN" to "+504",
-            "SV" to "+503",
-            "NI" to "+505",
-            "DO" to "+1809",
-            "JM" to "+1876",
-            "TT" to "+1868",
-        )
-
-    fun countryCallingCodeFor(isoCode: String): String? = countryCallingCodes[isoCode.uppercase(Locale.ROOT)]
-
-    val supportedCountryCodes: Set<String> = countryCallingCodes.keys
-
-    fun parseRegionCodes(raw: String): Set<String> = normalizeRegionCodes(raw.split(',', ';', '\n', '\t', ' '))
+    // "+1 809" names one area code. Split on the space, it would allow all of +1.
+    fun parseRegionCodes(raw: String): Set<String> = normalizeRegionCodes(raw.replace(SPACED_NANP_AREA_CODE, "+1").split(',', ';', '\n', '\t', ' '))
 
     fun normalizeRegionCodes(regions: Iterable<String>): Set<String> =
         regions
             .asSequence()
             .map { it.trim().uppercase(Locale.ROOT) }
-            .filter { it in supportedRegionCodes || it in supportedCountryCodes }
+            .mapNotNull { code -> code.takeIf { it in supportedRegionCodes } ?: normalizeDialingCode(code) }
             .distinct()
             .take(MAX_ALLOWED_REGIONS)
             .toCollection(linkedSetOf())
 
+    /**
+     * A country is allowed by its calling code (`+57`), never by a two-letter
+     * ISO code: CO, IN, PA, SK and many more ISO codes are also US state or
+     * Canadian province codes, and a two-letter entry keeps meaning the state
+     * or province. An area code (`+1809`) names one of the Caribbean countries
+     * that share +1. Returns [code] when it is one of those forms.
+     */
+    fun normalizeDialingCode(code: String): String? {
+        if (!code.startsWith("+")) return null
+        val digits = code.substring(1)
+        if (digits.isEmpty() || digits[0] == '0' || !digits.all { it.isAsciiDigit() }) return null
+        val isNanpAreaCode = digits.length == NANP_AREA_CODE_ENTRY_LENGTH && digits[0] == '1' && digits[1] in '2'..'9'
+        return code.takeIf { isNanpAreaCode || countryCallingCodeOf(digits) == digits }
+    }
+
     fun parseNamePatterns(raw: String): Set<String> = normalizeNamePatterns(raw.split('\n', ',', ';'))
 
     fun normalizeNamePatterns(patterns: Iterable<String>): Set<String> =
@@ -186,7 +122,12 @@ object RegionRules {
             .take(MAX_NAME_PATTERNS)
             .toCollection(linkedSetOf())
 
-    fun regionCode(number: String): String? = AreaCodeLookup.getRegionCode(number)
+    /**
+     * The NANP state, province or territory code of [number], or null. A `+`
+     * number outside +1 is never NANP, even when it has ten digits: Penang's
+     * +60 4 would otherwise read as Vancouver's 604.
+     */
+    fun regionCode(number: String): String? = if (number.startsWith("+") && !number.startsWith("+1")) null else AreaCodeLookup.getRegionCode(number)
 
     fun isOutsideAllowedRegions(
         number: String,
@@ -196,11 +137,19 @@ object RegionRules {
         if (normalized.isEmpty()) return false
         val nanpRegion = regionCode(number)
         if (nanpRegion != null && nanpRegion in normalized) return false
-        for (code in normalized) {
-            val prefix = countryCallingCodeFor(code) ?: continue
-            if (number.startsWith(prefix)) return false
+        val international = internationalForm(number) ?: return true
+        return normalized.none { it.startsWith("+") && international.startsWith(it) }
+    }
+
+    /** [number] as `+<digits>`, reading a bare ten- or eleven-digit number as NANP. */
+    private fun internationalForm(number: String): String? {
+        if (number.startsWith("+")) return number
+        val digits = filterAsciiDigits(number)
+        return when {
+            digits.length == NANP_NATIONAL_LENGTH -> "+1$digits"
+            digits.length == NANP_NATIONAL_LENGTH + 1 && digits.startsWith("1") -> "+$digits"
+            else -> null
         }
-        return true
     }
 
     fun matchesPresentedName(
@@ -257,4 +206,5 @@ object RegionRules {
     }
 
     private val WHITESPACE = Regex("\\s+")
+    private val SPACED_NANP_AREA_CODE = Regex("""\+1[ \t]+(?=[2-9][0-9]{2}(?![0-9]))""")
 }
@@ -89,6 +89,21 @@ fun hasMinAsciiDigits(
     minimum: Int = MIN_CONFIRMABLE_PHONE_DIGITS,
 ): Boolean = filterAsciiDigits(value).length >= minimum
 
+/**
+ * The ITU-T E.164 country calling code that [digits] (no `+`) starts with, or
+ * null when there are too few digits to hold one. Calling codes are
+ * prefix-free: 1 and 7 are the only one-digit codes, the two-digit ones are
+ * listed in [TWO_DIGIT_CALLING_CODES], and every other code has three digits.
+ */
+fun countryCallingCodeOf(digits: String): String? =
+    when {
+        digits.isEmpty() -> null
+        digits.take(1) in ONE_DIGIT_CALLING_CODES -> digits.take(1)
+        digits.take(2) in TWO_DIGIT_CALLING_CODES -> digits.take(2)
+        digits.length >= 3 -> digits.take(3)
+        else -> null
+    }
+
 private fun Char.isPhoneFormatControl(): Boolean =
     when (code) {
         ZERO_WIDTH_SPACE,
@@ -102,6 +117,20 @@ private fun Char.isPhoneFormatControl(): Boolean =
         else -> false
     }
 
+/** Every assigned one- and two-digit ITU-T E.164 country calling code. */
+private val ONE_DIGIT_CALLING_CODES = setOf("1", "7")
+
+private val TWO_DIGIT_CALLING_CODES =
+    (
+        "20 27 " +
+            "30 31 32 33 34 36 39 " +
+            "40 41 43 44 45 46 47 48 49 " +
+            "51 52 53 54 55 56 57 58 " +
+            "60 61 62 63 64 65 66 " +
+            "81 82 84 86 " +
+            "90 91 92 93 94 95 98"
+    ).split(" ").toSet()
+
 private const val DEFAULT_PHONE_INPUT_LENGTH = 24
 private const val MAX_PHONE_INPUT_SCAN_LENGTH = 256
 private const val MIN_CONFIRMABLE_PHONE_DIGITS = 5
 
@@ -1076,12 +1076,12 @@
     <string name="settings_region_cnap_rules">地区与主叫姓名规则</string>
     <string name="settings_region_cnap_summary">%1$d 个允许地区 · %2$d 个可信姓名 · %3$d 个拦截姓名</string>
     <string name="region_rules_title">地区与主叫姓名规则</string>
-    <string name="region_rules_disclosure">这些规则完全在你的设备上运行。地区拦截使用来电号码的 NANP 区号。主叫姓名信任仅使用 Android 暴露给筛查服务的运营商呈现姓名。</string>
+    <string name="region_rules_disclosure">这些规则完全在你的设备上运行。地区拦截对北美号码读取区号，对其他号码读取国家代码。主叫姓名信任仅使用 Android 暴露给筛查服务的运营商呈现姓名。</string>
     <string name="region_rules_block_outside">拦截允许地区之外的来电</string>
-    <string name="region_rules_block_outside_desc">允许所选美国各州、加拿大各省与领地；拦截其他及国际号码。</string>
+    <string name="region_rules_block_outside_desc">只有你列出的地区和国家的来电会响铃，其他来电都会被拦截。</string>
     <string name="region_rules_allowed_regions">允许的地区代码</string>
-    <string name="region_rules_regions_hint">逗号分隔的两字母代码，例如 NY, NJ, ON。用 TF 表示免费电话。</string>
-    <string name="region_rules_regions_required">请至少添加一个有效的两字母地区代码。</string>
+    <string name="region_rules_regions_hint">用逗号分隔。美国州或加拿大省用两个字母（NY、ON），免费电话用 TF。国家用 + 加国际区号，例如意大利 +39，多米尼加共和国 +1809。</string>
+    <string name="region_rules_regions_required">请至少添加一个有效的地区或国家代码。</string>
     <string name="cnap_trust_title">信任呈现的主叫姓名</string>
     <string name="cnap_trust_desc">当运营商提供主叫姓名时，匹配的来电可绕过地区与统计拦截。</string>
     <string name="cnap_trust_patterns">可信姓名模式</string>
 
@@ -1619,15 +1619,15 @@
     <string name="reg_prefix_india_1600_allow">Protect India 1600 series</string>
     <string name="reg_prefix_india_1600_allow_desc">India\'s 1600 series is used by banks, insurers, and government. TRAI prohibits blocking it.</string>
     <string name="region_rules_title">Region &amp; caller-name rules</string>
-    <string name="region_rules_disclosure">These rules run entirely on your device. Region blocking uses the incoming number\'s NANP area code. Caller-name trust uses only a carrier-presented name that Android exposes to the screening service.</string>
+    <string name="region_rules_disclosure">These rules run entirely on your device. Region blocking reads the area code of a North American number and the country code of any other. Caller-name trust uses only a carrier-presented name that Android exposes to the screening service.</string>
     <string name="region_rules_block_outside">Block calls outside allowed regions</string>
-    <string name="region_rules_block_outside_desc">Allow selected US states, Canadian provinces, and territories; block other and international numbers.</string>
+    <string name="region_rules_block_outside_desc">Only the regions and countries you list can ring. Calls from anywhere else are blocked.</string>
     <string name="region_rules_allowed_regions">Allowed region codes</string>
-    <string name="region_rules_regions_hint">Comma-separated two-letter codes, for example NY, NJ, ON. Use TF for toll-free.</string>
-    <string name="region_rules_regions_required">Add at least one valid two-letter region code.</string>
+    <string name="region_rules_regions_hint">Separate with commas. Use two letters for a US state or Canadian province (NY, ON) and TF for toll-free. Use + and the calling code for a country, like +39 for Italy or +1809 for the Dominican Republic.</string>
+    <string name="region_rules_regions_required">Add at least one valid region or country code.</string>
     <plurals name="region_rules_regions_count">
-        <item quantity="one">%1$d valid region code</item>
-        <item quantity="other">%1$d valid region codes</item>
+        <item quantity="one">%1$d valid code</item>
+        <item quantity="other">%1$d valid codes</item>
     </plurals>
     <string name="cnap_device_unavailable_notice">This device hasn\'t provided a caller name during screening. These rules won\'t take effect until it does.</string>
     <string name="cnap_trust_title">Trust a presented caller name</string>