commit 9fe176d6f22a06d42229ffce9b2bc85a1c7f86a1
author Tony Mantler <nicoya@google.com> Tue Sep 17 20:53:43 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Sep 17 20:53:43 2013 +0000
tree c2969bbbfe516af5457c2066c9b0a330f34f43bc
parent 94599580f738c4700174be250ecf7392768a432b
parent 42229b06c62c4126cca8d4c243e98066176cf7c2

Merge "Add a selection parameter to deletion so that the calendar provider doesn't complain" into jb-ub-mail-ur10

src/com/android/exchange/ExchangeService.java

diff --git a/src/com/android/exchange/ExchangeService.java b/src/com/android/exchange/ExchangeService.java
index c916a21..cd391c3 100644
--- a/src/com/android/exchange/ExchangeService.java
+++ b/src/com/android/exchange/ExchangeService.java
@@ -364,30 +364,28 @@
     }
 
     public static void deleteAccountPIMData(final Context context, final long accountId) {
-        Mailbox mailbox =
+        /*Mailbox mailbox =
             Mailbox.restoreMailboxOfType(context, accountId, Mailbox.TYPE_CONTACTS);
         if (mailbox != null) {
             EasSyncService service = EasSyncService.getServiceForMailbox(context, mailbox);
             // ContactsSyncAdapter is gone now, and this class is deprecated.
             // Just leaving this commented out code here for reference.
-//            ContactsSyncAdapter adapter = new ContactsSyncAdapter(service);
-//            adapter.wipe();
-        }
-        mailbox =
+            ContactsSyncAdapter adapter = new ContactsSyncAdapter(service);
+            adapter.wipe();
+        }*/
+        final Mailbox mailbox =
             Mailbox.restoreMailboxOfType(context, accountId, Mailbox.TYPE_CALENDAR);
 
         if (mailbox != null) {
-            EasSyncService service = EasSyncService.getServiceForMailbox(context, mailbox);
-            Uri eventsAsSyncAdapter = eventsAsSyncAdapter(Events.CONTENT_URI,
+            final EasSyncService service = EasSyncService.getServiceForMailbox(context, mailbox);
+            final Uri eventsAsSyncAdapter = eventsAsSyncAdapter(Events.CONTENT_URI,
                     service.mAccount.mEmailAddress, Eas.EXCHANGE_ACCOUNT_MANAGER_TYPE);
-            // ContactsSyncAdapter is gone now, and this class is deprecated.
+            // CalenderSyncAdapter is gone now, and this class is deprecated.
             // Just leaving this commented out code here for reference.
 //          CalendarSyncAdapter adapter = new CalendarSyncAdapter(service);
 //          adapter.wipe();
-            // XXX In CalendarSyncAdapter.wipe(), we would add the account name and
-            // account type as uri query parameters, and also selection and selectionArgs.
-            // Do we need both for some reason?
-            context.getContentResolver().delete(eventsAsSyncAdapter, null, null);
+            // Need to have a selection since we don't specify an id in the url
+            context.getContentResolver().delete(eventsAsSyncAdapter, "TRUE", new String[0]);
             unregisterCalendarObservers();
 
         }