commit 7681c4fcb3d4f574900918f3603d08158464cf21
author Marc Blank <mblank@google.com> Wed Sep 23 10:52:00 2009 -0700
committer Marc Blank <mblank@google.com> Wed Sep 23 10:52:00 2009 -0700
tree cf4571b8c4ccbc25b05b9a36f3e300a9d7e61830
parent 439127b3f0f55b088996c619358a82e570fa1692

Fix EAS sending, which was inadvertently broken by a change in EmailProvider

* syncServerId in the Message table can now be NULL; this broke a test
  used by EasOutboxService and SyncManager to determine whether there
  were sendable messages in the Outbox
* Changed test to allow for NULL in syncServerId

Change-Id: Id76c7a45bc306abe7a927ab2395700f54a01a298

src/com/android/exchange/EasOutboxService.java

diff --git a/src/com/android/exchange/EasOutboxService.java b/src/com/android/exchange/EasOutboxService.java
index de5cf49..561e073 100644
--- a/src/com/android/exchange/EasOutboxService.java
+++ b/src/com/android/exchange/EasOutboxService.java
@@ -46,7 +46,8 @@
 
     public static final int SEND_FAILED = 1;
     public static final String MAILBOX_KEY_AND_NOT_SEND_FAILED =
-        MessageColumns.MAILBOX_KEY + "=? and " + SyncColumns.SERVER_ID + "!=" + SEND_FAILED;
+        MessageColumns.MAILBOX_KEY + "=? and (" + SyncColumns.SERVER_ID + " is null or " + 
+            SyncColumns.SERVER_ID + "!=" + SEND_FAILED + ')';
     public static final String[] BODY_SOURCE_PROJECTION =
         new String[] {BodyColumns.SOURCE_MESSAGE_KEY};
     public static final String WHERE_MESSAGE_KEY = Body.MESSAGE_KEY + "=?";