1 files changed, 4 insertions, 35 deletions
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SelectKeyCursorAdapter.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SelectKeyCursorAdapter.java
index 03010f7a2..a7ef0785b 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SelectKeyCursorAdapter.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SelectKeyCursorAdapter.java
@@ -25,10 +25,6 @@ import org.sufficientlysecure.keychain.provider.KeychainContract.UserIds;
 
 import android.content.Context;
 import android.database.Cursor;
-import android.support.v4.widget.CursorAdapter;
-import android.text.Html;
-import android.text.Spannable;
-import android.text.style.ForegroundColorSpan;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -36,10 +32,9 @@ import android.widget.CheckBox;
 import android.widget.ListView;
 import android.widget.TextView;
 
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
-public class SelectKeyCursorAdapter extends CursorAdapter {
+
+public class SelectKeyCursorAdapter extends HighlightQueryCursorAdapter {
 
     protected int mKeyType;
 
@@ -53,7 +48,6 @@ public class SelectKeyCursorAdapter extends CursorAdapter {
 
     public final static String PROJECTION_ROW_AVAILABLE = "available";
     public final static String PROJECTION_ROW_VALID = "valid";
-    private String mCurQuery;
 
     public SelectKeyCursorAdapter(Context context, Cursor c, int flags, ListView listView,
             int keyType) {
@@ -62,7 +56,6 @@ public class SelectKeyCursorAdapter extends CursorAdapter {
         mInflater = LayoutInflater.from(context);
         mListView = listView;
         mKeyType = keyType;
-        mCurQuery = null;
         initIndex(c);
     }
 
@@ -165,8 +158,8 @@ public class SelectKeyCursorAdapter extends CursorAdapter {
         mainUserIdRest.setEnabled(valid);
         keyId.setEnabled(valid);
         status.setEnabled(valid);
-
-        if(mCurQuery != null){
+        String query = getSearchQuery();
+        if(query != null){
             mainUserId.setText(highlightSearchKey(userIdSplit[0]));
             mainUserIdRest.setText(highlightSearchKey(userIdSplit[1]));
         }
@@ -176,28 +169,4 @@ public class SelectKeyCursorAdapter extends CursorAdapter {
     public View newView(Context context, Cursor cursor, ViewGroup parent) {
         return mInflater.inflate(R.layout.select_key_item, null);
     }
-
-    public void setSearchQuery(String searchQuery){
-        mCurQuery = searchQuery;
-    }
-
-    private Spannable highlightSearchKey(String text) {
-        Spannable  highlight;
-        Pattern pattern;
-        Matcher matcher;
-        String     orig_str;
-
-        orig_str  = Html.fromHtml(text).toString();
-        highlight  = (Spannable) Html.fromHtml(text);
-        pattern = Pattern.compile("(?i)" + mCurQuery);
-        matcher = pattern.matcher(orig_str);
-        if (matcher.find()) {
-            highlight.setSpan(
-                    new ForegroundColorSpan(0xFF33B5E5),
-                    matcher.start(),
-                    matcher.end(),
-                    Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
-        }
-        return highlight;
-    }
 }