commit e040876b306dfc2e161f080f53e32dd96bc873bd
author Jeff Sharkey <jsharkey@android.com> Tue Nov 03 12:57:16 2009 -0800
committer Jeff Sharkey <jsharkey@android.com> Tue Nov 03 12:57:16 2009 -0800
tree fe96f89ed02c1aed3a40c29a74f440f1515fe492
parent 93640fa2b864d83ce15d22f349144972765647a3

Avoid offering "share" for restricted-only contacts.

Fixes http://b/2223256

src/com/android/contacts/ViewContactActivity.java

diff --git a/src/com/android/contacts/ViewContactActivity.java b/src/com/android/contacts/ViewContactActivity.java
index 06296cc..ca3c08a 100644
--- a/src/com/android/contacts/ViewContactActivity.java
+++ b/src/com/android/contacts/ViewContactActivity.java
@@ -138,6 +138,8 @@
 
     protected int mReadOnlySourcesCnt;
     protected int mWritableSourcesCnt;
+    protected boolean mAllRestricted;
+
     protected ArrayList<Long> mWritableRawContactIds = new ArrayList<Long>();
 
     private static final int TOKEN_ENTITIES = 0;
@@ -451,6 +453,9 @@
         final boolean hasRawContact = (mRawContactIds.size() > 0);
         menu.findItem(R.id.menu_edit).setEnabled(hasRawContact);
 
+        // Only allow share when unrestricted contacts available
+        menu.findItem(R.id.menu_share).setEnabled(!mAllRestricted);
+
         return true;
     }
 
@@ -527,6 +532,8 @@
                 return true;
             }
             case R.id.menu_share: {
+                if (mAllRestricted) return false;
+
                 // TODO: Keep around actual LOOKUP_KEY, or formalize method of extracting
                 final String lookupKey = mLookupUri.getPathSegments().get(2);
                 final Uri shareUri = Uri.withAppendedPath(Contacts.CONTENT_VCARD_URI, lookupKey);
@@ -767,8 +774,11 @@
         }
 
         mRawContactIds.clear();
+
         mReadOnlySourcesCnt = 0;
         mWritableSourcesCnt = 0;
+        mAllRestricted = true;
+
         mWritableRawContactIds.clear();
 
         final Context context = this;
@@ -781,6 +791,10 @@
                 final String accountType = entValues.getAsString(RawContacts.ACCOUNT_TYPE);
                 final long rawContactId = entValues.getAsLong(RawContacts._ID);
 
+                // Mark when this contact has any unrestricted components
+                final boolean isRestricted = entValues.getAsInteger(RawContacts.IS_RESTRICTED) != 0;
+                if (!isRestricted) mAllRestricted = false;
+
                 if (!mRawContactIds.contains(rawContactId)) {
                     mRawContactIds.add(rawContactId);
                 }