Fix footer show/hide
Change-Id: Ieb3b16d3149f3420a6554ed0c72d0f0ff8f426f1
diff --git a/src/com/android/mail/ui/ConversationListFragment.java b/src/com/android/mail/ui/ConversationListFragment.java
index a3fbf8e..e207c63 100644
--- a/src/com/android/mail/ui/ConversationListFragment.java
+++ b/src/com/android/mail/ui/ConversationListFragment.java
@@ -532,6 +532,7 @@
mConversationListCursor.sync();
}
mListAdapter.swapCursor(mConversationListCursor);
+ onFolderUpdated(mFolder);
mConversationListCursor.addListener(this);
if (mActivity.shouldShowFirstConversation()) {
if (mConversationListCursor.getCount() > 0) {
@@ -562,10 +563,11 @@
if (folder.loadMoreUri == null) {
mListAdapter.hideFooter();
} else {
- if (folder.totalCount >= mListAdapter.getCount()) {
- mListAdapter.hideFooter();
- } else {
+ if ((mListAdapter.getCursor() != null) &&
+ (folder.totalCount > mListAdapter.getCount())) {
mListAdapter.showFooter();
+ } else {
+ mListAdapter.hideFooter();
}
}
}