From a796fbab0237c094aa943de68f85d201dd22503b Mon Sep 17 00:00:00 2001
From: Makoto Onuki <omakoto@google.com>
Date: Wed, 12 Jan 2011 17:47:26 -0800
Subject: [PATCH] Fix "load more messages"

Was simply broken.

Bug 3347062

Change-Id: Ic8d16be377ee5a9871f0019a0b008a4de2390f15
---
 src/com/android/email/RefreshManager.java     |  2 +-
 .../com/android/email/RefreshManagerTest.java | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/src/com/android/email/RefreshManager.java b/src/com/android/email/RefreshManager.java
index 977464ae3..280409ada 100644
--- a/src/com/android/email/RefreshManager.java
+++ b/src/com/android/email/RefreshManager.java
@@ -239,7 +239,7 @@ public class RefreshManager {
      * "load more messages" in a mailbox.
      */
     public boolean loadMoreMessages(long accountId, long mailboxId) {
-        return refreshMessageList(accountId, mailboxId, true);
+        return refreshMessageList(accountId, mailboxId, true, true);
     }
 
     private boolean refreshMessageList(long accountId, long mailboxId, boolean loadMoreMessages,
diff --git a/tests/src/com/android/email/RefreshManagerTest.java b/tests/src/com/android/email/RefreshManagerTest.java
index 4badfc42f..1f6f81b1f 100644
--- a/tests/src/com/android/email/RefreshManagerTest.java
+++ b/tests/src/com/android/email/RefreshManagerTest.java
@@ -402,6 +402,17 @@ public class RefreshManagerTest extends InstrumentationTestCase {
         }, WAIT_UNTIL_TIMEOUT_SECONDS);
     }
 
+    public void testLoadMoreMessages() {
+        final long ACCOUNT_ID = 123;
+        final long MAILBOX_ID = 456;
+
+        mTarget.loadMoreMessages(ACCOUNT_ID, MAILBOX_ID);
+
+        assertTrue(mController.mCalledLoadMoreMessages);
+        assertEquals(mController.mMailboxId, MAILBOX_ID);
+        assertFalse(mController.mCalledUpdateMailbox);
+    }
+
     // volatile is necessary for testSendPendingMessagesForAllAccounts().
     // (Not all of them are actually necessary, but added for consistency.)
     private static class MockController extends Controller {
@@ -410,6 +421,7 @@ public class RefreshManagerTest extends InstrumentationTestCase {
         public volatile boolean mCalledSendPendingMessages;
         public volatile boolean mCalledUpdateMailbox;
         public volatile boolean mCalledUpdateMailboxList;
+        public volatile boolean mCalledLoadMoreMessages;
         public volatile Result mListener;
 
         protected MockController(Context context) {
@@ -443,6 +455,13 @@ public class RefreshManagerTest extends InstrumentationTestCase {
             mAccountId = accountId;
         }
 
+        @Override
+        public void loadMoreMessages(long mailboxId) {
+            mCalledLoadMoreMessages = true;
+            mAccountId = -1;
+            mMailboxId = mailboxId;
+        }
+
         @Override
         public void addResultCallback(Result listener) {
             Assert.assertTrue(mListener == null);