From c868acf442a69429056a574c67a5e0187e2b9536 Mon Sep 17 00:00:00 2001 From: Fred Quintana Date: Wed, 30 Sep 2009 18:17:47 -0700 Subject: show events in the UI --- core/java/android/pim/vcard/ContactStruct.java | 9 +++++---- core/java/android/pim/vcard/VCardComposer.java | 10 +++++++--- 2 files changed, 12 insertions(+), 7 deletions(-) (limited to 'core/java/android/pim/vcard') diff --git a/core/java/android/pim/vcard/ContactStruct.java b/core/java/android/pim/vcard/ContactStruct.java index a078f15..b6a453a 100644 --- a/core/java/android/pim/vcard/ContactStruct.java +++ b/core/java/android/pim/vcard/ContactStruct.java @@ -25,8 +25,8 @@ import android.provider.ContactsContract; import android.provider.ContactsContract.Data; import android.provider.ContactsContract.Groups; import android.provider.ContactsContract.RawContacts; -import android.provider.ContactsContract.CommonDataKinds.Birthday; import android.provider.ContactsContract.CommonDataKinds.Email; +import android.provider.ContactsContract.CommonDataKinds.Event; import android.provider.ContactsContract.CommonDataKinds.GroupMembership; import android.provider.ContactsContract.CommonDataKinds.Im; import android.provider.ContactsContract.CommonDataKinds.Nickname; @@ -1317,9 +1317,10 @@ public class ContactStruct { if (!TextUtils.isEmpty(mBirthday)) { builder = ContentProviderOperation.newInsert(Data.CONTENT_URI); - builder.withValueBackReference(Birthday.RAW_CONTACT_ID, 0); - builder.withValue(Data.MIMETYPE, Birthday.CONTENT_ITEM_TYPE); - builder.withValue(Birthday.BIRTHDAY, mBirthday); + builder.withValueBackReference(Event.RAW_CONTACT_ID, 0); + builder.withValue(Data.MIMETYPE, Event.CONTENT_ITEM_TYPE); + builder.withValue(Event.START_DATE, mBirthday); + builder.withValue(Event.TYPE, Event.TYPE_BIRTHDAY); operationList.add(builder.build()); } diff --git a/core/java/android/pim/vcard/VCardComposer.java b/core/java/android/pim/vcard/VCardComposer.java index c943d85..7b75f4a 100644 --- a/core/java/android/pim/vcard/VCardComposer.java +++ b/core/java/android/pim/vcard/VCardComposer.java @@ -30,8 +30,8 @@ import android.provider.CallLog.Calls; import android.provider.ContactsContract.Contacts; import android.provider.ContactsContract.Data; import android.provider.ContactsContract.RawContacts; -import android.provider.ContactsContract.CommonDataKinds.Birthday; import android.provider.ContactsContract.CommonDataKinds.Email; +import android.provider.ContactsContract.CommonDataKinds.Event; import android.provider.ContactsContract.CommonDataKinds.Im; import android.provider.ContactsContract.CommonDataKinds.Nickname; import android.provider.ContactsContract.CommonDataKinds.Note; @@ -1301,12 +1301,16 @@ public class VCardComposer { private void appendBirthday(final StringBuilder builder, final Map> contentValuesListMap) { final List contentValuesList = contentValuesListMap - .get(Birthday.CONTENT_ITEM_TYPE); + .get(Event.CONTENT_ITEM_TYPE); if (contentValuesList != null && contentValuesList.size() > 0) { + Integer eventType = contentValuesList.get(0).getAsInteger(Event.TYPE); + if (eventType == null || !eventType.equals(Event.TYPE_BIRTHDAY)) { + return; + } // Theoretically, there must be only one birthday for each vCard data and // we are afraid of some parse error occuring in some devices, so // we emit only one birthday entry for now. - String birthday = contentValuesList.get(0).getAsString(Birthday.BIRTHDAY); + String birthday = contentValuesList.get(0).getAsString(Event.START_DATE); if (birthday != null) { birthday = birthday.trim(); } -- cgit v1.1