diff options
author | Daisuke Miyakawa <dmiyakawa@google.com> | 2009-09-23 17:30:04 -0700 |
---|---|---|
committer | Daisuke Miyakawa <dmiyakawa@google.com> | 2009-09-23 18:11:09 -0700 |
commit | de26b54bb64d00edb233b23b8db3271b99ba0797 (patch) | |
tree | d9efa53513d679804b6ee410c25a468551727476 /core/java/android/pim/vcard | |
parent | 9d31e1bebaf3ae5d54751c32466edcea6e7433dd (diff) | |
download | frameworks_base-de26b54bb64d00edb233b23b8db3271b99ba0797.zip frameworks_base-de26b54bb64d00edb233b23b8db3271b99ba0797.tar.gz frameworks_base-de26b54bb64d00edb233b23b8db3271b99ba0797.tar.bz2 |
Make ContactStruct explicitly set RawContacts.ACCOUNT_NAME and RawContacts.ACCOUNT_TYPE to null.
Contacts app's EditContactActivity now explicitly set those to null, so I thought vCard importer
also shold do so.
Internal issue number: 2141766
TODO:
Contacts app's side should be also modified to completely fix the issue above.
Diffstat (limited to 'core/java/android/pim/vcard')
-rw-r--r-- | core/java/android/pim/vcard/ContactStruct.java | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/core/java/android/pim/vcard/ContactStruct.java b/core/java/android/pim/vcard/ContactStruct.java index b895398..df0c834 100644 --- a/core/java/android/pim/vcard/ContactStruct.java +++ b/core/java/android/pim/vcard/ContactStruct.java @@ -1026,8 +1026,7 @@ public class ContactStruct { } } - // From HardCodedSources.java in Contacts app. - // TODO: fix this. + // From GoogleSource.java in Contacts app. private static final String ACCOUNT_TYPE_GOOGLE = "com.google.GAIA"; private static final String GOOGLE_MY_CONTACTS_GROUP = "System Group: My Contacts"; @@ -1041,7 +1040,8 @@ public class ContactStruct { builder.withValue(RawContacts.ACCOUNT_NAME, mAccount.name); builder.withValue(RawContacts.ACCOUNT_TYPE, mAccount.type); - // TODO: temporal fix for "My Groups" issue. Need to be refactored. + // Assume that caller side creates this group if it does not exist. + // TODO: refactor this code along with the change in GoogleSource.java if (ACCOUNT_TYPE_GOOGLE.equals(mAccount.type)) { final Cursor cursor = resolver.query(Groups.CONTENT_URI, new String[] { Groups.SOURCE_ID }, @@ -1058,7 +1058,8 @@ public class ContactStruct { } } } else { - builder.withValues(new ContentValues()); + builder.withValue(RawContacts.ACCOUNT_NAME, null); + builder.withValue(RawContacts.ACCOUNT_TYPE, null); } operationList.add(builder.build()); |