commit fada72168f3e3788ad604827edfde7ac903d3df6
author Martin Hibdon <mhibdon@google.com> Fri May 30 22:15:55 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri May 30 22:15:56 2014 +0000
tree 98006b996b1528c5557adaff5ccb53d9af00bc81
parent 02ecddf1eedeb5ded770a71f3e724bdff8b610bd
parent 30393c8d15ca25b6a4a255803f3381bd1050db62

Merge "Change IEmailService.sync to have two different forms" into ub-mail-master

src/com/android/exchange/service/EasService.java

diff --git a/src/com/android/exchange/service/EasService.java b/src/com/android/exchange/service/EasService.java
index fd7b17d..c786921 100644
--- a/src/com/android/exchange/service/EasService.java
+++ b/src/com/android/exchange/service/EasService.java
@@ -18,6 +18,7 @@
 
 import android.app.Service;
 import android.content.ContentResolver;
+import android.content.Context;
 import android.content.Intent;
 import android.database.Cursor;
 import android.os.AsyncTask;
@@ -43,6 +44,7 @@
 import com.android.exchange.eas.EasOperation;
 import com.android.exchange.eas.EasSearch;
 import com.android.exchange.eas.EasSendMeetingResponse;
+import com.android.exchange.eas.EasSyncBase;
 import com.android.mail.utils.LogUtils;
 
 import java.util.HashSet;
@@ -94,8 +96,26 @@
         }
 
         @Override
-        public void sync(final long accountId, final boolean updateFolderList,
-                final int mailboxType, final long[] folders) {}
+        public void syncFolders(final long accountId, final boolean updateFolderList,
+                         final long[] folders) {
+            final Account account = Account.restoreAccountWithId(EasService.this, accountId);
+            for (final long folderId : folders) {
+                // TODO: Performance would be improved if we could do multiple folders in
+                // a single operation.
+                final Mailbox mailbox = Mailbox.restoreMailboxWithId(EasService.this, folderId);
+                EasOperation op = new EasSyncBase(EasService.this, account, mailbox);
+            }
+        }
+
+        @Override
+        public void syncMailboxType(final long accountId, final boolean updateFolderList,
+                         final int mailboxType) {
+            final Account account = Account.restoreAccountWithId(EasService.this, accountId);
+            // TODO: What if there are multiple mailboxes of this type?
+            final Mailbox mailbox = Mailbox.restoreMailboxOfType(EasService.this, accountId,
+                    mailboxType);
+            EasOperation op = new EasSyncBase(EasService.this, account, mailbox);
+        }
 
         @Override
         public void pushModify(final long accountId) {

src/com/android/exchange/service/EmailSyncAdapterService.java

diff --git a/src/com/android/exchange/service/EmailSyncAdapterService.java b/src/com/android/exchange/service/EmailSyncAdapterService.java
index 6534b8f..2d17a86 100644
--- a/src/com/android/exchange/service/EmailSyncAdapterService.java
+++ b/src/com/android/exchange/service/EmailSyncAdapterService.java
@@ -548,8 +548,12 @@
         }
 
         @Override
-        public void sync(final long accountId, final boolean updateFolderList,
-                final int mailboxType, final long[] folders) {}
+        public void syncFolders(final long accountId, final boolean updateFolderList,
+                         final long[] folders) {}
+
+        @Override
+        public void syncMailboxType(final long accountId, final boolean updateFolderList,
+                         final int mailboxType) {}
     };
 
     public EmailSyncAdapterService() {