fix(locale): make default country determination more robust

Signed-off-by: Brandon McAnsh <[email protected]>

Author: bmc08gt

libs/locale/impl/src/main/kotlin/com/getcode/util/locale/AndroidLocale.kt

@@ -12,7 +12,7 @@ class AndroidLocale @Inject constructor(
         return LocaleUtils.getDefaultCurrency(context)
     }
 
-    override fun getDefaultCountry(): String {
+    override suspend fun getDefaultCountry(): String? {
         return LocaleUtils.getDefaultCountry(context)
     }
 }

libs/locale/public/build.gradle.kts

@@ -32,6 +32,7 @@ android {
 dependencies {
     implementation(project(":libs:datetime"))
     implementation(project(":libs:currency"))
+    implementation(Libs.okhttp)
     api(Libs.androidx_annotation)
     api(Libs.kotlin_stdlib)
     api(Libs.kotlinx_coroutines_core)

libs/locale/public/src/main/kotlin/com/getcode/util/locale/LocaleHelper.kt

@@ -2,5 +2,5 @@ package com.getcode.util.locale
 
 interface LocaleHelper {
     fun getDefaultCurrencyName(): String
-    fun getDefaultCountry(): String
+    suspend fun getDefaultCountry(): String?
 }

libs/locale/public/src/main/kotlin/com/getcode/util/locale/LocaleUtils.kt

@@ -5,14 +5,44 @@ import android.telephony.TelephonyManager
 import com.getcode.model.CurrencyCode
 import com.getcode.model.CurrencyCode.Companion
 import com.getcode.model.RegionCode
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+import okhttp3.OkHttpClient
+import okhttp3.Request
+import org.json.JSONObject
 import java.util.*
+import java.util.concurrent.TimeUnit
 
 object LocaleUtils {
-    fun getDefaultCountry(context: Context): String {
+    suspend fun getDefaultCountry(context: Context): String? {
         val tm = context.getSystemService(Context.TELEPHONY_SERVICE) as TelephonyManager
         val networkCountryIso = tm.networkCountryIso.uppercase()
         val simCountryIso = tm.simCountryIso.uppercase()
-        return simCountryIso.ifBlank { networkCountryIso }
+        val localeCountry = context.resources.configuration.locale.country.uppercase()
+
+        val simCountry = if (simCountryIso.isNotBlank() && simCountryIso.length == 2) simCountryIso else null
+        val localeCountryValid = if (localeCountry.isNotBlank() && localeCountry.length == 2) localeCountry else null
+        val networkCountry = if (networkCountryIso.isNotBlank() && networkCountryIso.length == 2) networkCountryIso else null
+
+        return simCountry ?: localeCountryValid ?: networkCountry ?:getCountryFromIp()
+    }
+
+    private suspend fun getCountryFromIp(): String? = withContext(Dispatchers.IO) {
+        try {
+            val client = OkHttpClient.Builder()
+                .connectTimeout(5, TimeUnit.SECONDS)
+                .readTimeout(5, TimeUnit.SECONDS)
+                .build()
+            val request = Request.Builder().url("http://ip-api.com/json/?fields=countryCode").build()
+            val response = client.newCall(request).execute()
+            if (response.isSuccessful) {
+                val json = JSONObject(response.body?.string() ?: "{}")
+                val ipCountry = json.optString("countryCode", "").uppercase()
+                if (ipCountry.length == 2) ipCountry else "US"
+            } else null
+        } catch (e: Exception) {
+            return@withContext null
+        }
     }
 
     fun getDefaultCurrency(context: Context): String {

services/flipcash/src/main/kotlin/com/flipcash/services/controllers/AccountController.kt

@@ -5,6 +5,7 @@ import com.flipcash.services.repository.AccountRepository
 import com.flipcash.services.user.UserManager
 import com.getcode.opencode.model.core.ID
 import com.getcode.util.locale.LocaleHelper
+import com.getcode.utils.trace
 import javax.inject.Inject
 
 class AccountController @Inject constructor(
@@ -31,7 +32,9 @@ class AccountController @Inject constructor(
         val userId = userManager.accountId
             ?: return Result.failure(Throwable("No user ID in UserManager"))
 
-        val countryCode = localeHelper.getDefaultCountry()
+        val countryCode = localeHelper.getDefaultCountry().orEmpty()
+
+        trace("user's device country code is $countryCode")
 
         return repository.getUserFlags(
             owner = owner,

services/flipcash/src/main/kotlin/com/flipcash/services/controllers/ProfileController.kt

@@ -30,12 +30,6 @@ class ProfileController @Inject constructor(
                     type = TraceType.Process,
                 )
                 userManager.set(it)
-            }.onFailure {
-                trace(
-                    tag = "Profile",
-                    message = "Failed to update user profile",
-                    type = TraceType.Error
-                )
             }
     }