From 2397176d9ea3e0aef1254278f17fe5a07a3f9e12 Mon Sep 17 00:00:00 2001
From: Moxie Marlinspike <moxie@thoughtcrime.org>
Date: Sun, 24 Feb 2013 19:37:37 -0800
Subject: [PATCH] Search support in ConversationList for <3.0 devices.

Switch to the newly-introduced ActionBarSherlock SearchView.
---
 res/menu/conversation_list.xml                       |  2 +-
 .../securesms/ConversationListFragment.java          | 12 +++++-------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/res/menu/conversation_list.xml b/res/menu/conversation_list.xml
index 23da464c86..4bd788c63b 100644
--- a/res/menu/conversation_list.xml
+++ b/res/menu/conversation_list.xml
@@ -4,7 +4,7 @@
     <item android:title="@string/conversation_list__menu_search"
           android:id="@+id/menu_search"
           android:icon="@drawable/ic_menu_search_holo_dark"
-          android:actionViewClass="android.widget.SearchView"
+          android:actionViewClass="com.actionbarsherlock.widget.SearchView"
           android:showAsAction="ifRoom|collapseActionView" />
 
 </menu>
diff --git a/src/org/thoughtcrime/securesms/ConversationListFragment.java b/src/org/thoughtcrime/securesms/ConversationListFragment.java
index 558b810104..fbb225812f 100644
--- a/src/org/thoughtcrime/securesms/ConversationListFragment.java
+++ b/src/org/thoughtcrime/securesms/ConversationListFragment.java
@@ -16,14 +16,12 @@
  */
 package org.thoughtcrime.securesms;
 
-import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.ProgressDialog;
 import android.content.DialogInterface;
 import android.database.Cursor;
 import android.os.AsyncTask;
-import android.os.Build;
 import android.os.Bundle;
 import android.support.v4.app.LoaderManager;
 import android.support.v4.content.Loader;
@@ -45,6 +43,7 @@ import com.actionbarsherlock.view.ActionMode;
 import com.actionbarsherlock.view.Menu;
 import com.actionbarsherlock.view.MenuInflater;
 import com.actionbarsherlock.view.MenuItem;
+import com.actionbarsherlock.widget.SearchView;
 
 import java.util.Set;
 
@@ -83,9 +82,9 @@ public class ConversationListFragment extends SherlockListFragment
   public void onPrepareOptionsMenu(Menu menu) {
     MenuInflater inflater = this.getSherlockActivity().getSupportMenuInflater();
 
-    if (this.masterSecret != null && Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
+    if (this.masterSecret != null) {
       inflater.inflate(R.menu.conversation_list, menu);
-      initializeSearch((android.widget.SearchView)menu.findItem(R.id.menu_search).getActionView());
+      initializeSearch((SearchView)menu.findItem(R.id.menu_search).getActionView());
     } else {
       inflater.inflate(R.menu.conversation_list_empty, menu);
     }
@@ -108,9 +107,8 @@ public class ConversationListFragment extends SherlockListFragment
     }
   }
 
-  @SuppressLint({ "NewApi", "NewApi" })
-  private void initializeSearch(android.widget.SearchView searchView) {
-    searchView.setOnQueryTextListener(new android.widget.SearchView.OnQueryTextListener() {
+  private void initializeSearch(SearchView searchView) {
+    searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
       @Override
       public boolean onQueryTextSubmit(String query) {
         ConversationListFragment.this.queryFilter = query;