From e79c67eeff26662d5800f1eaa9ec45ea90d205cb Mon Sep 17 00:00:00 2001
From: Mygod <contact-git@mygod.be>
Date: Fri, 7 May 2021 14:37:40 -0400
Subject: [PATCH] Refine country regex

---
 mobile/src/main/java/be/mygod/vpnhotspot/client/MacLookup.kt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/client/MacLookup.kt b/mobile/src/main/java/be/mygod/vpnhotspot/client/MacLookup.kt
index f235c983..4fef8d8c 100644
--- a/mobile/src/main/java/be/mygod/vpnhotspot/client/MacLookup.kt
+++ b/mobile/src/main/java/be/mygod/vpnhotspot/client/MacLookup.kt
@@ -27,7 +27,8 @@ object MacLookup {
     }
 
     private val macLookupBusy = mutableMapOf<MacAddressCompat, Pair<HttpURLConnection, Job>>()
-    private val countryCodeRegex = "([A-Z]{2})\\s*\$".toRegex() // http://en.wikipedia.org/wiki/ISO_3166-1
+    // http://en.wikipedia.org/wiki/ISO_3166-1
+    private val countryCodeRegex = "(?:^|[^A-Z])([A-Z]{2})[\\s\\d]*$".toRegex()
 
     @MainThread
     fun abort(mac: MacAddressCompat) = macLookupBusy.remove(mac)?.let { (conn, job) ->