[2/2] Add new method for determining whether to show block option

BlockRequests only work on certain data types.
Phone numbers are currently the only type supported.
It doesn't make sense to give block action to something that won't get blocked.

Ticket CD-461

Change-Id: Ic02dedb7815f2239e8bf031c1d4b1e422fca9d04

1 files changed, 1 insertions, 4 deletions

diff --git a/src/com/android/contacts/quickcontact/QuickContactActivity.java b/src/com/android/contacts/quickcontact/QuickContactActivity.java
index 7f6ae7faa..1b8a8daf2 100644
--- a/src/com/android/contacts/quickcontact/QuickContactActivity.java
+++ b/src/com/android/contacts/quickcontact/QuickContactActivity.java
@@ -181,7 +181,6 @@ import com.cyanogen.ambient.discovery.util.NudgeKey;
 import com.cyanogen.ambient.incall.extension.OriginCodes;
 import com.cyanogen.ambient.plugin.PluginStatus;
 import com.android.contactsbind.HelpUtils;
-import com.android.internal.telephony.util.BlacklistUtils;
 
 import com.cyanogen.lookup.phonenumber.provider.LookupProviderImpl;
 import com.google.common.collect.Lists;
@@ -313,7 +312,6 @@ public class QuickContactActivity extends ContactsActivity implements
 
     private Target mContactBitmapTarget;
     private BlockContactHelper mBlockContactHelper;
-    private boolean mIsBlacklistingEnabled;
 
     private Object mLock = new Object();
     /**
@@ -1316,7 +1314,6 @@ public class QuickContactActivity extends ContactsActivity implements
             destroyInteractionLoaders();
             startInteractionLoaders(mCachedCp2DataCardModel);
         }
-        mIsBlacklistingEnabled = BlacklistUtils.isBlacklistEnabled(this);
     }
 
     @Override
@@ -2989,7 +2986,7 @@ public class QuickContactActivity extends ContactsActivity implements
 
             // set block or un-block menu titles accordingly
             final MenuItem blockMenuItem = menu.findItem(R.id.menu_block_contact);
-            if (mIsBlacklistingEnabled) {
+            if (mBlockContactHelper.canBlockContact(this)) {
                 blockMenuItem.setVisible(true);
                 if (mBlockContactHelper.isContactBlacklisted()) {
                     blockMenuItem.setTitle(R.string.menu_unblock_contact);