Merge remote-tracking branch 'origin/master' into wrapped-key-ring

Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpImportExport.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java

5 files changed, 37 insertions, 88 deletions

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/HighlightQueryCursorAdapter.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/HighlightQueryCursorAdapter.java
deleted file mode 100644
index fd7a2dc30..000000000
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/HighlightQueryCursorAdapter.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright (C) 2014 Dominik Schürmann <dominik@dominikschuermann.de>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package org.sufficientlysecure.keychain.ui.adapter;
-
-import android.content.Context;
-import android.database.Cursor;
-import android.support.v4.widget.CursorAdapter;
-import android.text.Spannable;
-import android.text.style.ForegroundColorSpan;
-
-import org.sufficientlysecure.keychain.R;
-
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-public abstract class HighlightQueryCursorAdapter extends CursorAdapter {
-
-    private String mCurQuery;
-
-    public HighlightQueryCursorAdapter(Context context, Cursor c, int flags) {
-        super(context, c, flags);
-        mCurQuery = null;
-    }
-
-    public void setSearchQuery(String searchQuery) {
-        mCurQuery = searchQuery;
-    }
-
-    public String getSearchQuery() {
-        return mCurQuery;
-    }
-
-    protected Spannable highlightSearchQuery(String text) {
-        Spannable highlight = Spannable.Factory.getInstance().newSpannable(text);
-
-        if (mCurQuery != null) {
-            Pattern pattern = Pattern.compile("(?i)" + mCurQuery);
-            Matcher matcher = pattern.matcher(text);
-            if (matcher.find()) {
-                highlight.setSpan(
-                        new ForegroundColorSpan(mContext.getResources().getColor(R.color.emphasis)),
-                        matcher.start(),
-                        matcher.end(),
-                        Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
-            }
-            return highlight;
-        } else {
-            return highlight;
-        }
-    }
-}
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java
index 9d323c822..9573efdfe 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java
@@ -33,6 +33,7 @@ import android.widget.TextView;
 import org.sufficientlysecure.keychain.R;
 import org.sufficientlysecure.keychain.keyimport.ImportKeysListEntry;
 import org.sufficientlysecure.keychain.pgp.PgpKeyHelper;
+import org.sufficientlysecure.keychain.util.Highlighter;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -99,6 +100,7 @@ public class ImportKeysAdapter extends ArrayAdapter<ImportKeysListEntry> {
 
     public View getView(int position, View convertView, ViewGroup parent) {
         ImportKeysListEntry entry = mData.get(position);
+        Highlighter highlighter = new Highlighter(mActivity, entry.getQuery());
         ViewHolder holder;
         if (convertView == null) {
             holder = new ViewHolder();
@@ -128,7 +130,7 @@ public class ImportKeysAdapter extends ArrayAdapter<ImportKeysListEntry> {
                         + " " + userIdSplit[0]);
                 holder.mainUserId.setTextColor(Color.RED);
             } else {
-                holder.mainUserId.setText(userIdSplit[0]);
+                holder.mainUserId.setText(highlighter.highlight(userIdSplit[0]));
                 holder.mainUserId.setTextColor(Color.BLACK);
             }
         } else {
@@ -139,21 +141,26 @@ public class ImportKeysAdapter extends ArrayAdapter<ImportKeysListEntry> {
         // email
         if (userIdSplit[1] != null) {
             holder.mainUserIdRest.setVisibility(View.VISIBLE);
-            holder.mainUserIdRest.setText(userIdSplit[1]);
+            holder.mainUserIdRest.setText(highlighter.highlight(userIdSplit[1]));
         } else {
             holder.mainUserIdRest.setVisibility(View.GONE);
         }
 
         holder.keyId.setText(entry.keyIdHex);
 
-        if (entry.fingerPrintHex != null) {
+        if (entry.fingerprintHex != null) {
             holder.fingerprint.setVisibility(View.VISIBLE);
-            holder.fingerprint.setText(PgpKeyHelper.colorizeFingerprint(entry.fingerPrintHex));
+            holder.fingerprint.setText(PgpKeyHelper.colorizeFingerprint(entry.fingerprintHex));
         } else {
             holder.fingerprint.setVisibility(View.GONE);
         }
 
-        holder.algorithm.setText("" + entry.bitStrength + "/" + entry.algorithm);
+        if (entry.bitStrength != 0 && entry.algorithm != null) {
+            holder.algorithm.setText("" + entry.bitStrength + "/" + entry.algorithm);
+            holder.algorithm.setVisibility(View.VISIBLE);
+        } else {
+            holder.algorithm.setVisibility(View.INVISIBLE);
+        }
 
         if (entry.revoked) {
             holder.status.setVisibility(View.VISIBLE);
@@ -177,7 +184,7 @@ public class ImportKeysAdapter extends ArrayAdapter<ImportKeysListEntry> {
                 String uid = it.next();
                 TextView uidView = (TextView) mInflater.inflate(
                         R.layout.import_keys_list_entry_user_id, null);
-                uidView.setText(uid);
+                uidView.setText(highlighter.highlight(uid));
                 holder.userIdsList.addView(uidView);
             }
         }
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListKeybaseLoader.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListKeybaseLoader.java
index 420880522..0fdc019d0 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListKeybaseLoader.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListKeybaseLoader.java
@@ -22,8 +22,8 @@ import android.support.v4.content.AsyncTaskLoader;
 
 import org.sufficientlysecure.keychain.Constants;
 import org.sufficientlysecure.keychain.keyimport.ImportKeysListEntry;
-import org.sufficientlysecure.keychain.keyimport.KeyServer;
-import org.sufficientlysecure.keychain.keyimport.KeybaseKeyServer;
+import org.sufficientlysecure.keychain.keyimport.Keyserver;
+import org.sufficientlysecure.keychain.keyimport.KeybaseKeyserver;
 import org.sufficientlysecure.keychain.util.Log;
 
 import java.util.ArrayList;
@@ -86,7 +86,7 @@ public class ImportKeysListKeybaseLoader
      */
     private void queryServer(String query) {
 
-        KeybaseKeyServer server = new KeybaseKeyServer();
+        KeybaseKeyserver server = new KeybaseKeyserver();
         try {
             ArrayList<ImportKeysListEntry> searchResult = server.search(query);
 
@@ -94,11 +94,11 @@ public class ImportKeysListKeybaseLoader
 
             mEntryList.addAll(searchResult);
             mEntryListWrapper = new AsyncTaskResultWrapper<ArrayList<ImportKeysListEntry>>(mEntryList, null);
-        } catch (KeyServer.InsufficientQuery e) {
+        } catch (Keyserver.InsufficientQuery e) {
             mEntryListWrapper = new AsyncTaskResultWrapper<ArrayList<ImportKeysListEntry>>(mEntryList, e);
-        } catch (KeyServer.QueryException e) {
+        } catch (Keyserver.QueryException e) {
             mEntryListWrapper = new AsyncTaskResultWrapper<ArrayList<ImportKeysListEntry>>(mEntryList, e);
-        } catch (KeyServer.TooManyResponses e) {
+        } catch (Keyserver.TooManyResponses e) {
             mEntryListWrapper = new AsyncTaskResultWrapper<ArrayList<ImportKeysListEntry>>(mEntryList, e);
         }
 
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListServerLoader.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListServerLoader.java
index 4175592d6..1b8d7d30e 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListServerLoader.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListServerLoader.java
@@ -21,9 +21,9 @@ import android.content.Context;
 import android.support.v4.content.AsyncTaskLoader;
 
 import org.sufficientlysecure.keychain.Constants;
-import org.sufficientlysecure.keychain.keyimport.HkpKeyServer;
+import org.sufficientlysecure.keychain.keyimport.HkpKeyserver;
 import org.sufficientlysecure.keychain.keyimport.ImportKeysListEntry;
-import org.sufficientlysecure.keychain.keyimport.KeyServer;
+import org.sufficientlysecure.keychain.keyimport.Keyserver;
 import org.sufficientlysecure.keychain.util.Log;
 
 import java.util.ArrayList;
@@ -92,7 +92,7 @@ public class ImportKeysListServerLoader
      * Query keyserver
      */
     private void queryServer(String query, String keyServer, boolean enforceFingerprint) {
-        HkpKeyServer server = new HkpKeyServer(keyServer);
+        HkpKeyserver server = new HkpKeyserver(keyServer);
         try {
             ArrayList<ImportKeysListEntry> searchResult = server.search(query);
 
@@ -108,7 +108,7 @@ public class ImportKeysListServerLoader
                      * set fingerprint explicitly after query
                      * to enforce a check when the key is imported by KeychainIntentService
                      */
-                    uniqueEntry.setFingerPrintHex(fingerprint);
+                    uniqueEntry.setFingerprintHex(fingerprint);
                     uniqueEntry.setSelected(true);
                     mEntryList.add(uniqueEntry);
                 }
@@ -116,11 +116,11 @@ public class ImportKeysListServerLoader
                 mEntryList.addAll(searchResult);
             }
             mEntryListWrapper = new AsyncTaskResultWrapper<ArrayList<ImportKeysListEntry>>(mEntryList, null);
-        } catch (KeyServer.InsufficientQuery e) {
+        } catch (Keyserver.InsufficientQuery e) {
             mEntryListWrapper = new AsyncTaskResultWrapper<ArrayList<ImportKeysListEntry>>(mEntryList, e);
-        } catch (KeyServer.QueryException e) {
+        } catch (Keyserver.QueryException e) {
             mEntryListWrapper = new AsyncTaskResultWrapper<ArrayList<ImportKeysListEntry>>(mEntryList, e);
-        } catch (KeyServer.TooManyResponses e) {
+        } catch (Keyserver.TooManyResponses e) {
             mEntryListWrapper = new AsyncTaskResultWrapper<ArrayList<ImportKeysListEntry>>(mEntryList, e);
         }
     }
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SelectKeyCursorAdapter.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SelectKeyCursorAdapter.java
index cde008175..00cd554b9 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SelectKeyCursorAdapter.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SelectKeyCursorAdapter.java
@@ -19,6 +19,7 @@ package org.sufficientlysecure.keychain.ui.adapter;
 
 import android.content.Context;
 import android.database.Cursor;
+import android.support.v4.widget.CursorAdapter;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -29,6 +30,7 @@ import android.widget.TextView;
 import org.sufficientlysecure.keychain.R;
 import org.sufficientlysecure.keychain.pgp.PgpKeyHelper;
 import org.sufficientlysecure.keychain.provider.KeychainContract.KeyRings;
+import org.sufficientlysecure.keychain.util.Highlighter;
 
 import java.util.Date;
 
@@ -36,8 +38,9 @@ import java.util.Date;
 /**
  * Yes this class is abstract!
  */
-abstract public class SelectKeyCursorAdapter extends HighlightQueryCursorAdapter {
+abstract public class SelectKeyCursorAdapter extends CursorAdapter {
 
+    private String mQuery;
     private LayoutInflater mInflater;
 
     protected int mIndexUserId, mIndexMasterKeyId, mIndexRevoked, mIndexExpiry;
@@ -48,6 +51,10 @@ abstract public class SelectKeyCursorAdapter extends HighlightQueryCursorAdapter
         initIndex(c);
     }
 
+    public void setSearchQuery(String query) {
+        mQuery = query;
+    }
+
     @Override
     public Cursor swapCursor(Cursor newCursor) {
         initIndex(newCursor);
@@ -101,19 +108,20 @@ abstract public class SelectKeyCursorAdapter extends HighlightQueryCursorAdapter
 
     @Override
     public void bindView(View view, Context context, Cursor cursor) {
+        Highlighter highlighter = new Highlighter(context, mQuery);
         ViewHolderItem h = (ViewHolderItem) view.getTag();
 
         String userId = cursor.getString(mIndexUserId);
         String[] userIdSplit = PgpKeyHelper.splitUserId(userId);
 
         if (userIdSplit[0] != null) {
-            h.mainUserId.setText(highlightSearchQuery(userIdSplit[0]));
+            h.mainUserId.setText(highlighter.highlight(userIdSplit[0]));
         } else {
             h.mainUserId.setText(R.string.user_id_no_name);
         }
         if (userIdSplit[1] != null) {
             h.mainUserIdRest.setVisibility(View.VISIBLE);
-            h.mainUserIdRest.setText(highlightSearchQuery(userIdSplit[1]));
+            h.mainUserIdRest.setText(highlighter.highlight(userIdSplit[1]));
         } else {
             h.mainUserIdRest.setVisibility(View.GONE);
         }