From dd2acf1026943e7e59aca01e9085916812e843e3 Mon Sep 17 00:00:00 2001 From: Rohit Yengisetty Date: Tue, 12 Apr 2016 10:34:54 -0700 Subject: Make Block action contingent on system-wide Blacklist setting Change-Id: I9c7b474765fabcf0c8681367b49ba8ddb84f172e --- .../contacts/quickcontact/QuickContactActivity.java | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/src/com/android/contacts/quickcontact/QuickContactActivity.java b/src/com/android/contacts/quickcontact/QuickContactActivity.java index 8ad67e0ae..7f6ae7faa 100644 --- a/src/com/android/contacts/quickcontact/QuickContactActivity.java +++ b/src/com/android/contacts/quickcontact/QuickContactActivity.java @@ -181,6 +181,7 @@ 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; @@ -312,6 +313,8 @@ public class QuickContactActivity extends ContactsActivity implements private Target mContactBitmapTarget; private BlockContactHelper mBlockContactHelper; + private boolean mIsBlacklistingEnabled; + private Object mLock = new Object(); /** * {@link #LEADING_MIMETYPES} is used to sort MIME-types. @@ -1313,6 +1316,7 @@ public class QuickContactActivity extends ContactsActivity implements destroyInteractionLoaders(); startInteractionLoaders(mCachedCp2DataCardModel); } + mIsBlacklistingEnabled = BlacklistUtils.isBlacklistEnabled(this); } @Override @@ -2985,10 +2989,15 @@ 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 (mBlockContactHelper.isContactBlacklisted()) { - blockMenuItem.setTitle(R.string.menu_unblock_contact); + if (mIsBlacklistingEnabled) { + blockMenuItem.setVisible(true); + if (mBlockContactHelper.isContactBlacklisted()) { + blockMenuItem.setTitle(R.string.menu_unblock_contact); + } else { + blockMenuItem.setTitle(R.string.menu_block_contact); + } } else { - blockMenuItem.setTitle(R.string.menu_block_contact); + blockMenuItem.setVisible(false); } return true; -- cgit v1.2.3