Update tokenautocomplete

OpenKeychain/build.gradle

@@ -47,7 +47,7 @@ dependencies {
     compile 'com.getbase:floatingactionbutton:1.10.1'
     compile 'org.commonjava.googlecode.markdown4j:markdown4j:2.2-cj-1.0'
     compile 'org.ocpsoft.prettytime:prettytime:3.2.7.Final'
-    compile 'com.splitwise:tokenautocomplete:1.3.3@aar'
+    compile 'com.splitwise:tokenautocomplete:2.0.2@aar'
     compile 'se.emilsjolander:stickylistheaders:2.6.0'
     compile 'org.sufficientlysecure:html-textview:1.2'
     compile 'com.mikepenz:materialdrawer:3.0.9@aar'
@@ -91,7 +91,7 @@ dependencyVerification {
             'com.getbase:floatingactionbutton:3edefa511aac4d90794c7b0496aca59cff2eee1e32679247b4f85acbeee05240',
             'org.commonjava.googlecode.markdown4j:markdown4j:e952e825d29e1317d96f79f346bfb6786c7c5eef50bd26e54a80823704b62e13',
             'org.ocpsoft.prettytime:prettytime:a6bc2641b3ab7873df604b77b6680c75b86d98e78afefb367940972f925591b5',
-            'com.splitwise:tokenautocomplete:20bee71cc59b3828eb000b684d46ddf738efd56b8fee453a509cd16fda42c8cb',
+            'com.splitwise:tokenautocomplete:2fc238424130b42155b5f2e39799a90bbbd13b148850afbe534ab08bb913c7f7',
             'se.emilsjolander:stickylistheaders:8c05981ec5725be33f7cee5e68c13f3db49cd5c75f1aaeb04024920b1ef96ad4',
             'org.sufficientlysecure:html-textview:1d3bed31ef837437154de8d2362a0e6b0e59b6c3535d87ee48c2fab12c84f9bb',
             'com.mikepenz:iconics:c1a02203d8e0d638959463c00af3ab9096e0a7c1ad5928762eb10ef5ce8a63cd',
@@ -108,11 +108,11 @@ dependencyVerification {
             'org.thoughtcrime.ssl.pinning:AndroidPinning:afa1d74e699257fa75cb109ff29bac50726ef269c6e306bdeffe8223cee06ef4',
 //            'OpenKeychain.extern.openkeychain-api-lib:openkeychain-intents:73d1bbf8f0288480d757d09b7cd655162ec65c05bdb0e214a8563cc05e48de8c',
 //            'OpenKeychain.extern.openpgp-api-lib:openpgp-api:1928b3a927dd9fb9c3f3a27fb032b559556aa35f96302ce9594d3200be3b02bc',
-//            'com.madgag.spongycastle:core:8fd58fd725f8a76de8875f0416e0a824e2fd11675e28ae4f6e2f4a5114c0fec1',
+//            'OpenKeychain.extern.spongycastle:core:8fd58fd725f8a76de8875f0416e0a824e2fd11675e28ae4f6e2f4a5114c0fec1',
-//            'com.madgag.spongycastle:pg:2b0bf8def92e41a13d177a394b0ab1784a6049a416eeb3d5e41359436051a2bd',
+//            'OpenKeychain.extern.spongycastle:pg:2b0bf8def92e41a13d177a394b0ab1784a6049a416eeb3d5e41359436051a2bd',
-//            'com.madgag.spongycastle:pkix:98effd8c01547c266d5483d428263778f4629e5ed14b82cb8acd439db3b82caa',
+//            'OpenKeychain.extern.spongycastle:pkix:98effd8c01547c266d5483d428263778f4629e5ed14b82cb8acd439db3b82caa',
 //            'OpenKeychain.extern:minidns:c4a75e5ee4a32e28326e033337fb3eedd7e1cb22683e3bd9bd617e582673ffb1',
-//            'com.madgag.spongycastle:prov:610e1ade360f147335e36939a4db5fff61fc1da93af2b81ed095fd29890f3019',
+//            'OpenKeychain.extern.spongycastle:prov:610e1ade360f147335e36939a4db5fff61fc1da93af2b81ed095fd29890f3019',
             'com.android.support:support-annotations:beac5cae60bdb597df9af9c916f785c2f71f8c8ae4be9a32d4298dea85496a42',
 //            'OpenKeychain.extern.KeybaseLib:Lib:e74bbf33600021993e493050768ca07b743a8308407daad7913aed44d86b0cea',
 //            'OpenKeychain.extern.safeslinger-exchange:safeslinger-exchange:a38a6c1077a59491489304780b4e7afce52b4f5d594d7998e448e5c9e5363fb6',
@@ -123,6 +123,7 @@ dependencyVerification {
 
 
 
+
 android {
     compileSdkVersion rootProject.ext.compileSdkVersion
     buildToolsVersion rootProject.ext.buildToolsVersion

OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/EncryptKeyCompletionView.java

@@ -23,6 +23,7 @@ import android.database.Cursor;
 import android.graphics.Rect;
 import android.net.Uri;
 import android.os.Bundle;
+import android.support.annotation.NonNull;
 import android.support.v4.app.FragmentActivity;
 import android.support.v4.app.LoaderManager;
 import android.support.v4.app.LoaderManager.LoaderCallbacks;
@@ -46,14 +47,14 @@ import org.sufficientlysecure.keychain.ui.adapter.KeyAdapter.KeyItem;
 import org.sufficientlysecure.keychain.util.Log;
 
 
-public class EncryptKeyCompletionView extends TokenCompleteTextView
+public class EncryptKeyCompletionView extends TokenCompleteTextView<KeyItem>
         implements LoaderCallbacks<Cursor> {
 
     public static final String ARG_QUERY = "query";
 
     private KeyAdapter mAdapter;
     private LoaderManager mLoaderManager;
-    private String mPrefix;
+    private CharSequence mPrefix;
 
     public EncryptKeyCompletionView(Context context) {
         super(context);
@@ -79,30 +80,27 @@ public class EncryptKeyCompletionView extends TokenCompleteTextView
     }
 
     @Override
-    public void setPrefix(String p) {
+    public void setPrefix(CharSequence p) {
         // this one is private in the superclass, but we need it here
         mPrefix = p;
         super.setPrefix(p);
     }
 
     @Override
-    protected View getViewForObject(Object object) {
+    protected View getViewForObject(KeyItem keyItem) {
-        if (object instanceof KeyItem) {
+        LayoutInflater l = LayoutInflater.from(getContext());
-            LayoutInflater l = LayoutInflater.from(getContext());
+        View view = l.inflate(R.layout.recipient_box_entry, null);
-            View view = l.inflate(R.layout.recipient_box_entry, null);
+        ((TextView) view.findViewById(android.R.id.text1)).setText(keyItem.getReadableName());
-            ((TextView) view.findViewById(android.R.id.text1)).setText(((KeyItem) object).getReadableName());
+        return view;
-            return view;
-        }
-        return null;
     }
 
     @Override
-    protected Object defaultObject(String completionText) {
+    protected KeyItem defaultObject(String completionText) {
         // TODO: We could try to automagically download the key if it's unknown but a key id
         /*if (completionText.startsWith("0x")) {
 
         }*/
-        return "";
+        return null;
     }
 
     @Override
@@ -128,7 +126,7 @@ public class EncryptKeyCompletionView extends TokenCompleteTextView
         // These are the rows that we will retrieve.
         Uri baseUri = KeyRings.buildUnifiedKeyRingsUri();
 
-        String[] projection = KeyAdapter.getProjectionWith(new String[] {
+        String[] projection = KeyAdapter.getProjectionWith(new String[]{
                 KeychainContract.KeyRings.HAS_ENCRYPT,
         });
 
@@ -179,7 +177,7 @@ public class EncryptKeyCompletionView extends TokenCompleteTextView
     }
 
     @Override
-    protected void performFiltering(CharSequence text, int start, int end, int keyCode) {
+    protected void performFiltering(@NonNull CharSequence text, int start, int end, int keyCode) {
         super.performFiltering(text, start, end, keyCode);
         if (start < mPrefix.length()) {
             start = mPrefix.length();