From c5a7d320f7fde6c4f7541a0d586542a5de7ebf98 Mon Sep 17 00:00:00 2001
From: Moxie Marlinspike <moxie@thoughtcrime.org>
Date: Fri, 4 Aug 2017 09:28:20 -0700
Subject: [PATCH] Don't query contacts DB if we have nothing to query

// FREEBIE
---
 .../thoughtcrime/securesms/recipients/RecipientProvider.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/org/thoughtcrime/securesms/recipients/RecipientProvider.java b/src/org/thoughtcrime/securesms/recipients/RecipientProvider.java
index bd6612c3de..f3d52ca32f 100644
--- a/src/org/thoughtcrime/securesms/recipients/RecipientProvider.java
+++ b/src/org/thoughtcrime/securesms/recipients/RecipientProvider.java
@@ -23,6 +23,7 @@ import android.provider.ContactsContract.Contacts;
 import android.provider.ContactsContract.PhoneLookup;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
+import android.text.TextUtils;
 import android.util.Log;
 
 import org.thoughtcrime.securesms.R;
@@ -134,7 +135,7 @@ class RecipientProvider {
     Optional<RecipientsPreferences> preferences = DatabaseFactory.getRecipientPreferenceDatabase(context).getRecipientsPreferences(new Address[]{address});
     MaterialColor                   color       = preferences.isPresent() ? preferences.get().getColor() : null;
 
-    if (address.isPhone()) {
+    if (address.isPhone() && !TextUtils.isEmpty(address.toPhoneString())) {
       Uri    uri    = Uri.withAppendedPath(PhoneLookup.CONTENT_FILTER_URI, Uri.encode(address.toPhoneString()));
       Cursor cursor = context.getContentResolver().query(uri, CALLER_ID_PROJECTION, null, null, null);