commit 35e5b677c1e783f59c7ac67a61a264a7e036d8e5
author android-build SharedAccount <android-build@sekiwake.mtv.corp.google.com> Fri Nov 20 14:41:25 2009 -0800
committer android-build SharedAccount <android-build@sekiwake.mtv.corp.google.com> Fri Nov 20 14:41:25 2009 -0800
tree de1b8fa1b3a0abecfae5d319946cd26f554b5269
parent 70ed7eac9316b90a0182fc2eeba015aa0e69b6a5
parent 863e6c40202fe804d92a263809da74ec1e904e66

Merge commit '863e6c40202fe804d92a263809da74ec1e904e66' into eclair-sholes-release

src/com/android/email/activity/MessageList.java

diff --git a/src/com/android/email/activity/MessageList.java b/src/com/android/email/activity/MessageList.java
index 6705043..b4334e5 100644
--- a/src/com/android/email/activity/MessageList.java
+++ b/src/com/android/email/activity/MessageList.java
@@ -604,8 +604,22 @@
     }
 
     private void onSendPendingMessages() {
-        long accountId = lookupAccountIdFromMailboxId(mMailboxId);
-        mController.sendPendingMessages(accountId, mControllerCallback);
+        if (mMailboxId == Mailbox.QUERY_ALL_OUTBOX) {
+            // For the combined Outbox, we loop through all accounts and send the messages
+            Cursor c = mResolver.query(Account.CONTENT_URI, Account.ID_PROJECTION,
+                    null, null, null);
+            try {
+                while (c.moveToNext()) {
+                    long accountId = c.getLong(Account.ID_PROJECTION_COLUMN);
+                    mController.sendPendingMessages(accountId, mControllerCallback);
+                }
+            } finally {
+                c.close();
+            }
+        } else {
+            long accountId = lookupAccountIdFromMailboxId(mMailboxId);
+            mController.sendPendingMessages(accountId, mControllerCallback);
+        }
     }
 
     private void onDelete(long messageId, long accountId) {