diff options
author | Zheng Fu <zhengfu@google.com> | 2015-07-17 22:34:11 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-17 22:34:11 +0000 |
commit | 0dc8027bc70dc24c411d875a60781d44a0cfcf34 (patch) | |
tree | 08de147572066b2bc77eb7f8bad01bd75e7ce2f1 | |
parent | 8a079b92788f590485203921a5c9be002823487b (diff) | |
parent | f3d2981b53b7d4715da1d35f5425b19766a92f8b (diff) | |
download | ContactsProvider-0dc8027bc70dc24c411d875a60781d44a0cfcf34.tar.gz |
am f3d2981b: Should update aggregate data after marking raw contact deleted.
* commit 'f3d2981b53b7d4715da1d35f5425b19766a92f8b':
Should update aggregate data after marking raw contact deleted.
-rw-r--r-- | src/com/android/providers/contacts/ContactsProvider2.java | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/src/com/android/providers/contacts/ContactsProvider2.java b/src/com/android/providers/contacts/ContactsProvider2.java index dba37096..200c25c7 100644 --- a/src/com/android/providers/contacts/ContactsProvider2.java +++ b/src/com/android/providers/contacts/ContactsProvider2.java @@ -3733,27 +3733,26 @@ public class ContactsProvider2 extends AbstractContactsProvider c.close(); } + final boolean contactIsSingleton = + ContactsTableUtil.deleteContactIfSingleton(db, rawContactId) == 1; + final int count; + if (callerIsSyncAdapter || rawContactIsLocal(rawContactId)) { // When a raw contact is deleted, a SQLite trigger deletes the parent contact. // TODO: all contact deletes was consolidated into ContactTableUtil but this one can't // because it's in a trigger. Consider removing trigger and replacing with java code. // This has to happen before the raw contact is deleted since it relies on the number // of raw contacts. - if (ContactsTableUtil.deleteContactIfSingleton(db, rawContactId) == 0) { - mAggregator.get().updateAggregateData(mTransactionContext.get(), contactId); - } - db.delete(Tables.PRESENCE, PresenceColumns.RAW_CONTACT_ID + "=" + rawContactId, null); - int count = db.delete(Tables.RAW_CONTACTS, RawContacts._ID + "=" + rawContactId, null); - + count = db.delete(Tables.RAW_CONTACTS, RawContacts._ID + "=" + rawContactId, null); mTransactionContext.get().markRawContactChangedOrDeletedOrInserted(rawContactId); - return count; + } else { + count = markRawContactAsDeleted(db, rawContactId, callerIsSyncAdapter); } - - if (ContactsTableUtil.deleteContactIfSingleton(db, rawContactId) == 0) { + if (!contactIsSingleton) { mAggregator.get().updateAggregateData(mTransactionContext.get(), contactId); } - return markRawContactAsDeleted(db, rawContactId, callerIsSyncAdapter); + return count; } /** |