commit 7eeb17d4cf706a3984b1f6999c05f7009a298289
author Mindy Pereira <mindyp@google.com> Mon Mar 05 14:53:25 2012 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Mon Mar 05 14:53:26 2012 -0800
tree c4b160afe7b9e1518825d730cbadc4a233393a9a
parent 771d6966862127d707237eca7ac78a1230063223
parent d2ca51ac0c0727ae924259918ac6f25b3f8ce571

Merge "Small cleanup."

src/com/android/mail/ui/FolderListFragment.java

diff --git a/src/com/android/mail/ui/FolderListFragment.java b/src/com/android/mail/ui/FolderListFragment.java
index 4297fad..a64eb6a 100644
--- a/src/com/android/mail/ui/FolderListFragment.java
+++ b/src/com/android/mail/ui/FolderListFragment.java
@@ -216,7 +216,7 @@
             getCursor().moveToPosition(position);
             Folder folder = new Folder(getCursor());
             folderItemView.bind(folder, null);
-            if (TextUtils.equals(folder.id, mSelectedFolder.id)) {
+            if (mSelectedFolder != null && TextUtils.equals(folder.id, mSelectedFolder.id)) {
                 getListView().setItemChecked(position, true);
             }
             return folderItemView;

src/com/android/mail/ui/TwoPaneController.java

diff --git a/src/com/android/mail/ui/TwoPaneController.java b/src/com/android/mail/ui/TwoPaneController.java
index 4d5fba0..7b9c8a4 100644
--- a/src/com/android/mail/ui/TwoPaneController.java
+++ b/src/com/android/mail/ui/TwoPaneController.java
@@ -211,7 +211,7 @@
     protected void popView(boolean preventClose) {
         // If the user is in search query entry mode, or the user is viewing search results, exit
         // the mode.
-        if (mConvListContext.isSearchResult()) {
+        if (mConvListContext != null && mConvListContext.isSearchResult()) {
             mActivity.finish();
         } else if (mViewMode.getMode() == ViewMode.CONVERSATION) {
             // Go to conversation list.