From ad16bf94cdb751788845ecd5529395796d52fcd2 Mon Sep 17 00:00:00 2001
From: Joe Steele <joe@madewell.net>
Date: Sun, 13 Jan 2013 22:35:59 -0500
Subject: [PATCH] Provide message search capability from the folder list.

The search is performed in all folders for the account
to which the folders belong.
---
 res/menu/folder_list_option.xml           |  5 +++++
 src/com/fsck/k9/activity/FolderList.java  | 13 +++++++++++++
 src/com/fsck/k9/activity/MessageList.java |  7 +++++--
 3 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/res/menu/folder_list_option.xml b/res/menu/folder_list_option.xml
index 65dd07c4f..3f700bcf5 100644
--- a/res/menu/folder_list_option.xml
+++ b/res/menu/folder_list_option.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item
+        android:id="@+id/search"
+        android:icon="?attr/iconActionSearch"
+        android:showAsAction="always"
+        android:title="@string/search_action"/>
     <item
         android:id="@+id/filter_folders"
         android:icon="?attr/iconActionSearchFolder"
diff --git a/src/com/fsck/k9/activity/FolderList.java b/src/com/fsck/k9/activity/FolderList.java
index c123ba12d..1ece40d3b 100644
--- a/src/com/fsck/k9/activity/FolderList.java
+++ b/src/com/fsck/k9/activity/FolderList.java
@@ -537,6 +537,11 @@ public class FolderList extends K9ListActivity implements OnNavigationListener {
 
             return true;
 
+        case R.id.search:
+            onSearchRequested();
+
+            return true;
+
         case R.id.compose:
             MessageCompose.actionCompose(this, mAccount);
 
@@ -598,6 +603,14 @@ public class FolderList extends K9ListActivity implements OnNavigationListener {
         }
     }
 
+    @Override
+    public boolean onSearchRequested() {
+         Bundle appData = new Bundle();
+         appData.putString(MessageList.EXTRA_SEARCH_ACCOUNT, mAccount.getUuid());
+         startSearch(null, false, appData, false);
+         return true;
+     }
+
     private void onOpenFolder(String folder) {
         LocalSearch search = new LocalSearch(folder);
         search.addAccountUuid(mAccount.getUuid());
diff --git a/src/com/fsck/k9/activity/MessageList.java b/src/com/fsck/k9/activity/MessageList.java
index 31eda7daf..92f5e4839 100644
--- a/src/com/fsck/k9/activity/MessageList.java
+++ b/src/com/fsck/k9/activity/MessageList.java
@@ -58,7 +58,7 @@ public class MessageList extends K9FragmentActivity implements MessageListFragme
     private static final String EXTRA_SPECIAL_FOLDER = "special_folder";
 
     // used for remote search
-    private static final String EXTRA_SEARCH_ACCOUNT = "com.fsck.k9.search_account";
+    public static final String EXTRA_SEARCH_ACCOUNT = "com.fsck.k9.search_account";
     private static final String EXTRA_SEARCH_FOLDER = "com.fsck.k9.search_folder";
 
     public static void actionDisplaySearch(Context context, SearchSpecification search,
@@ -180,7 +180,10 @@ public class MessageList extends K9FragmentActivity implements MessageListFragme
                 Bundle appData = getIntent().getBundleExtra(SearchManager.APP_DATA);
                 if (appData != null) {
                     mSearch.addAccountUuid(appData.getString(EXTRA_SEARCH_ACCOUNT));
-                    mSearch.addAllowedFolder(appData.getString(EXTRA_SEARCH_FOLDER));
+                    // searches started from a folder list activity will provide an account, but no folder
+                    if (appData.getString(EXTRA_SEARCH_FOLDER) != null) {
+                        mSearch.addAllowedFolder(appData.getString(EXTRA_SEARCH_FOLDER));
+                    }
                 } else {
                     mSearch.addAccountUuid(LocalSearch.ALL_ACCOUNTS);
                 }