Merge "Imap2 additions" into jb-ub-mail

1 files changed, 8 insertions, 2 deletions

diff --git a/emailsync/src/com/android/emailsync/SyncManager.java b/emailsync/src/com/android/emailsync/SyncManager.java
index db13e7e8f..9360b070c 100644
--- a/emailsync/src/com/android/emailsync/SyncManager.java
+++ b/emailsync/src/com/android/emailsync/SyncManager.java
@@ -1270,13 +1270,13 @@ public abstract class SyncManager extends Service implements Runnable {
         }
     }
 
-    private void setMailboxSyncStatus(long id, int status) {
+    public void setMailboxSyncStatus(long id, int status) {
         ContentValues values = new ContentValues();
         values.put(Mailbox.UI_SYNC_STATUS, status);
         mResolver.update(ContentUris.withAppendedId(Mailbox.CONTENT_URI, id), values, null, null);
     }
 
-    private void setMailboxLastSyncResult(long id, int result) {
+    public void setMailboxLastSyncResult(long id, int result) {
         ContentValues values = new ContentValues();
         values.put(Mailbox.UI_LAST_SYNC_RESULT, result);
         mResolver.update(ContentUris.withAppendedId(Mailbox.CONTENT_URI, id), values, null, null);
@@ -2008,6 +2008,7 @@ public abstract class SyncManager extends Service implements Runnable {
 
     static public void sendMessageRequest(Request req) {
         SyncManager ssm = INSTANCE;
+        if (ssm == null) return;
         Message msg = Message.restoreMessageWithId(ssm, req.mMessageId);
         if (msg == null) return;
         long mailboxId = msg.mMailboxKey;
@@ -2029,7 +2030,12 @@ public abstract class SyncManager extends Service implements Runnable {
                 }
             }
         }
+        sendRequest(mailboxId, req);
+    }
 
+    static public void sendRequest(long mailboxId, Request req) {
+        SyncManager ssm = INSTANCE;
+        if (ssm == null) return;
         AbstractSyncService service = ssm.mServiceMap.get(mailboxId);
         if (service == null) {
             startManualSync(mailboxId, SYNC_SERVICE_PART_REQUEST, req);