diff options
Diffstat (limited to 'core/java/android/syncml/pim/vcard/ContactStruct.java')
| -rw-r--r-- | core/java/android/syncml/pim/vcard/ContactStruct.java | 27 |
1 files changed, 12 insertions, 15 deletions
diff --git a/core/java/android/syncml/pim/vcard/ContactStruct.java b/core/java/android/syncml/pim/vcard/ContactStruct.java index afeb5cd..5a29112 100644 --- a/core/java/android/syncml/pim/vcard/ContactStruct.java +++ b/core/java/android/syncml/pim/vcard/ContactStruct.java @@ -17,6 +17,7 @@ package android.syncml.pim.vcard; import android.content.AbstractSyncableContentProvider; +import android.content.ContentProviderOperation; import android.content.ContentResolver; import android.content.ContentUris; import android.content.ContentValues; @@ -762,17 +763,16 @@ public class ContactStruct { personId = ContentUris.parseId(personUri); } } else { - personUri = provider.nonTransactionalInsert(People.CONTENT_URI, contentValues); + personUri = provider.insert(People.CONTENT_URI, contentValues); if (personUri != null) { personId = ContentUris.parseId(personUri); ContentValues values = new ContentValues(); values.put(GroupMembership.PERSON_ID, personId); values.put(GroupMembership.GROUP_ID, myContactsGroupId); - Uri resultUri = provider.nonTransactionalInsert( - GroupMembership.CONTENT_URI, values); + Uri resultUri = provider.insert(GroupMembership.CONTENT_URI, values); if (resultUri == null) { Log.e(LOG_TAG, "Faild to insert the person to MyContact."); - provider.nonTransactionalDelete(personUri, null, null); + provider.delete(personUri, null, null); personUri = null; } } @@ -812,7 +812,7 @@ public class ContactStruct { if (resolver != null) { phoneUri = resolver.insert(Phones.CONTENT_URI, values); } else { - phoneUri = provider.nonTransactionalInsert(Phones.CONTENT_URI, values); + phoneUri = provider.insert(Phones.CONTENT_URI, values); } if (phoneData.isPrimary) { primaryPhoneId = Long.parseLong(phoneUri.getLastPathSegment()); @@ -838,8 +838,7 @@ public class ContactStruct { if (resolver != null) { organizationUri = resolver.insert(Organizations.CONTENT_URI, values); } else { - organizationUri = provider.nonTransactionalInsert( - Organizations.CONTENT_URI, values); + organizationUri = provider.insert(Organizations.CONTENT_URI, values); } if (organizationData.isPrimary) { primaryOrganizationId = Long.parseLong(organizationUri.getLastPathSegment()); @@ -865,8 +864,7 @@ public class ContactStruct { if (resolver != null) { emailUri = resolver.insert(ContactMethods.CONTENT_URI, values); } else { - emailUri = provider.nonTransactionalInsert( - ContactMethods.CONTENT_URI, values); + emailUri = provider.insert(ContactMethods.CONTENT_URI, values); } if (contactMethod.isPrimary) { primaryEmailId = Long.parseLong(emailUri.getLastPathSegment()); @@ -875,8 +873,7 @@ public class ContactStruct { if (resolver != null) { resolver.insert(ContactMethods.CONTENT_URI, values); } else { - provider.nonTransactionalInsert( - ContactMethods.CONTENT_URI, values); + provider.insert(ContactMethods.CONTENT_URI, values); } } } @@ -900,7 +897,7 @@ public class ContactStruct { if (resolver != null) { contentValuesArray.add(values); } else { - provider.nonTransactionalInsert(Extensions.CONTENT_URI, values); + provider.insert(Extensions.CONTENT_URI, values); } } } @@ -924,7 +921,7 @@ public class ContactStruct { if (resolver != null) { resolver.update(personUri, values, null, null); } else { - provider.nonTransactionalUpdate(personUri, values, null, null); + provider.update(personUri, values, null, null); } } } @@ -942,12 +939,12 @@ public class ContactStruct { public void pushIntoAbstractSyncableContentProvider( AbstractSyncableContentProvider provider, long myContactsGroupId) { boolean successful = false; - provider.beginTransaction(); + provider.beginBatch(); try { pushIntoContentProviderOrResolver(provider, myContactsGroupId); successful = true; } finally { - provider.endTransaction(successful); + provider.endBatch(successful); } } |