Merge pull request #600 from WideChat/karan_add_contact_fallback

Add fallbacks for country code determination
WideChat · Aug 7, 2019 · 395c267 · 395c267
2 parents e98c6af + d2e592b
commit 395c267
Showing 1 changed file with 13 additions and 1 deletion.
diff --git a/app/src/main/java/chat/rocket/android/contacts/worker/ContactsSyncWorker.kt b/app/src/main/java/chat/rocket/android/contacts/worker/ContactsSyncWorker.kt
@@ -171,7 +171,19 @@ class ContactsSyncWorker(context : Context, params : WorkerParameters)
     }
 
     private fun formatPhoneNumber(phone: String, country:String): String? {
-        return PhoneNumberUtils.formatNumberToE164(phone.replace("-|\\s|\\(|\\)".toRegex(), ""), country)
+        var number = PhoneNumberUtils.formatNumberToE164(phone.replace("-|\\s|\\(|\\)".toRegex(), ""), country)
+
+        // Default fallback: Mexico
+        if (number==null) {
+            number = PhoneNumberUtils.formatNumberToE164(phone.replace("-|\\s|\\(|\\)".toRegex(), ""), "MX")
+        }
+
+        // Default fallback, second priority: US
+        if (number==null) {
+            number = PhoneNumberUtils.formatNumberToE164(phone.replace("-|\\s|\\(|\\)".toRegex(), ""), "US")
+        }
+
+        return number
     }
 
 }