Attempt to guard against native errors when retrieving phone numbers.

Djonique · Oct 13, 2018 · 29ca6c9 · 29ca6c9
1 parent b2111b3
commit 29ca6c9
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 10 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -37,7 +37,7 @@ android {
         applicationId "com.eblis.whenwasit"
         minSdkVersion 16
         targetSdkVersion 27
-        versionCode 29
+        versionCode 30
         versionName "1.0.${versionCode}"
         resConfigs "auto"
         vectorDrawables.useSupportLibrary = true

diff --git a/app/src/main/java/com/eblis/whenwasit/utils/ContactsHelper.java b/app/src/main/java/com/eblis/whenwasit/utils/ContactsHelper.java
@@ -77,21 +77,32 @@ public String getContactName(ContentResolver contentResolver, String id) {
     /**
      * Returns phone number from certain contact
      */
-    public String getContactPhoneNumber(ContentResolver contentResolver, String id) {
-        String phoneNumber = "";
-        Cursor phoneCursor = contentResolver.query(
+    public synchronized String getContactPhoneNumber(ContentResolver contentResolver, String id) {
+        final Cursor phoneCursor = contentResolver.query(
                 ContactsContract.CommonDataKinds.Phone.CONTENT_URI,
                 null,
                 ContactsContract.CommonDataKinds.Phone.CONTACT_ID + " = ?",
                 new String[]{id}, null);
-        if (phoneCursor != null && phoneCursor.moveToFirst()) {
-            phoneNumber = phoneCursor.getString(phoneCursor.getColumnIndex
-                    (ContactsContract.CommonDataKinds.Phone.NUMBER));
-        }
         if (phoneCursor != null) {
-            phoneCursor.close();
+            try {
+                phoneCursor.moveToFirst();
+                return phoneCursor.getString(phoneCursor.getColumnIndex
+                        (ContactsContract.CommonDataKinds.Phone.NUMBER));
+            }
+            catch (Exception ex) {
+                //no-op
+            }
+            finally {
+                try {
+                    phoneCursor.close();
+                }
+                catch (Exception ex) {
+                    //nothing we can do :(
+                }
+            }
         }
-        return phoneNumber;
+
+        return "";
     }
 
     /**