commit 2a8cef0eefdee8b8e6345851e304b609ae21dd2e
author Dmitri Plotnikov <dplotnikov@google.com> Wed Sep 23 19:01:15 2009 -0700
committer Dmitri Plotnikov <dplotnikov@google.com> Wed Sep 23 19:01:55 2009 -0700
tree 58239b036c3f4b7d6f049938e0221597de4d11d1
parent adedd75b1900c4c794a9e5702d9f43bdba4cea7c

Fixing the issue where empty contacts could not be joined

Basically if you did not have any _displayable_ items on a contact,
you could not merge it with another contact.

Change-Id: I58807cc25390bce4edb5fb0870641920281571f9

src/com/android/contacts/ViewContactActivity.java

diff --git a/src/com/android/contacts/ViewContactActivity.java b/src/com/android/contacts/ViewContactActivity.java
index 70c1867..9b22b4b 100644
--- a/src/com/android/contacts/ViewContactActivity.java
+++ b/src/com/android/contacts/ViewContactActivity.java
@@ -862,6 +862,11 @@
                 final String accountType = entValues.getAsString(RawContacts.ACCOUNT_TYPE);
                 final long rawContactId = entValues.getAsLong(RawContacts._ID);
 
+                if (!mRawContactIds.contains(rawContactId)) {
+                    mRawContactIds.add(rawContactId);
+                }
+
+
 //                // This performs the tab filtering
 //                if (mSelectedRawContactId != null
 //                        && mSelectedRawContactId != rawContactId
@@ -903,10 +908,6 @@
                         continue;
                     }
 
-                    if (!mRawContactIds.contains(entry.contactId)) {
-                        mRawContactIds.add(entry.contactId);
-                    }
-
                     if (CommonDataKinds.Phone.CONTENT_ITEM_TYPE.equals(mimetype)
                             || CommonDataKinds.Email.CONTENT_ITEM_TYPE.equals(mimetype)
                             || CommonDataKinds.StructuredPostal.CONTENT_ITEM_TYPE.equals(mimetype)