commit 077ad7bbd2db9555f47f58d724099c4a3941668a
author Fred Quintana <fredq@google.com> Mon Sep 14 17:31:33 2009 -0700
committer Fred Quintana <fredq@google.com> Mon Sep 14 17:37:18 2009 -0700
tree 4374afd1228fa22a7e53abd642fe7232ae9b9b51
parent 85f44a524693fb6ede88b3b1e683ca7b493d5983

change to use the new CALLER_IS_SYNCADAPTER flag

src/com/android/exchange/adapter/ContactsSyncAdapter.java

diff --git a/src/com/android/exchange/adapter/ContactsSyncAdapter.java b/src/com/android/exchange/adapter/ContactsSyncAdapter.java
index 919e6df..fc3204d 100644
--- a/src/com/android/exchange/adapter/ContactsSyncAdapter.java
+++ b/src/com/android/exchange/adapter/ContactsSyncAdapter.java
@@ -301,14 +301,12 @@
 
         public EasContactsSyncParser(InputStream in, ContactsSyncAdapter adapter) throws IOException {
             super(in, adapter);
-            mAccountUri = uriWithAccount(RawContacts.CONTENT_URI);
+            mAccountUri = uriWithAccountAndIsSyncAdapter(RawContacts.CONTENT_URI);
         }
 
         @Override
         public void wipe() {
-            mContentResolver.delete(mAccountUri.buildUpon()
-                    .appendQueryParameter(ContactsContract.RawContacts.DELETE_PERMANENTLY, "true")
-                    .build(), null, null);
+            mContentResolver.delete(mAccountUri, null, null);
         }
 
         public void addData(String serverId, ContactOperations ops, Entity entity)
@@ -831,10 +829,11 @@
     }
 
 
-    private Uri uriWithAccount(Uri uri) {
+    private Uri uriWithAccountAndIsSyncAdapter(Uri uri) {
         return uri.buildUpon()
             .appendQueryParameter(RawContacts.ACCOUNT_NAME, mAccount.mEmailAddress)
             .appendQueryParameter(RawContacts.ACCOUNT_TYPE, Eas.ACCOUNT_MANAGER_TYPE)
+            .appendQueryParameter(ContactsContract.CALLER_IS_SYNCADAPTER, "true")
             .build();
     }
 
@@ -897,7 +896,7 @@
 
         public void newContact(String serverId) {
             Builder builder = ContentProviderOperation
-                .newInsert(uriWithAccount(RawContacts.CONTENT_URI));
+                .newInsert(uriWithAccountAndIsSyncAdapter(RawContacts.CONTENT_URI));
             ContentValues values = new ContentValues();
             values.put(RawContacts.SOURCE_ID, serverId);
             builder.withValues(values);
@@ -910,8 +909,7 @@
             add(ContentProviderOperation
                     .newDelete(ContentUris.withAppendedId(RawContacts.CONTENT_URI, id)
                             .buildUpon()
-                            .appendQueryParameter(ContactsContract.RawContacts.DELETE_PERMANENTLY,
-                                    "true")
+                            .appendQueryParameter(ContactsContract.CALLER_IS_SYNCADAPTER, "true")
                             .build())
                     .build());
         }
@@ -1375,15 +1373,17 @@
         ContactOperations ops = new ContactOperations();
         for (Long id: mUpdatedIdList) {
             ops.add(ContentProviderOperation
-                    .newUpdate(ContentUris.withAppendedId(RawContacts.CONTENT_URI, id))
+                    .newUpdate(ContentUris.withAppendedId(RawContacts.CONTENT_URI, id)
+                            .buildUpon()
+                            .appendQueryParameter(ContactsContract.CALLER_IS_SYNCADAPTER, "true")
+                            .build())
                     .withValue(RawContacts.DIRTY, 0).build());
         }
         for (Long id: mDeletedIdList) {
             ops.add(ContentProviderOperation
                     .newDelete(ContentUris.withAppendedId(RawContacts.CONTENT_URI, id)
                             .buildUpon()
-                            .appendQueryParameter(ContactsContract.RawContacts.DELETE_PERMANENTLY,
-                                    "true")
+                            .appendQueryParameter(ContactsContract.CALLER_IS_SYNCADAPTER, "true")
                             .build())
                     .build());
         }
@@ -1394,7 +1394,7 @@
             // And that all of our groups are visible
             // TODO Perhaps the visible part should only happen when the group is created, but
             // this is fine for now.
-            Uri groupsUri = uriWithAccount(Groups.CONTENT_URI);
+            Uri groupsUri = uriWithAccountAndIsSyncAdapter(Groups.CONTENT_URI);
             Cursor c = cr.query(groupsUri, new String[] {Groups.SOURCE_ID, Groups.TITLE},
                     Groups.TITLE + " IS NULL", null, null);
             ContentValues values = new ContentValues();
@@ -1403,8 +1403,8 @@
                 while (c.moveToNext()) {
                     String sourceId = c.getString(0);
                     values.put(Groups.TITLE, sourceId);
-                    cr.update(uriWithAccount(groupsUri), values, Groups.SOURCE_ID + "=?",
-                            new String[] {sourceId});
+                    cr.update(uriWithAccountAndIsSyncAdapter(groupsUri), values,
+                            Groups.SOURCE_ID + "=?", new String[] {sourceId});
                 }
             } finally {
                 c.close();