From 64fbb0daecf14656c4396f518c41fb3068e534d6 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Mon, 30 Nov 2015 21:34:24 +0100
Subject: encryptkeycompletionview: don't use prefix

---
 .../keychain/ui/widget/EncryptKeyCompletionView.java | 20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

(limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/EncryptKeyCompletionView.java')

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/EncryptKeyCompletionView.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/EncryptKeyCompletionView.java
index c812edf71..065cfb5d0 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/EncryptKeyCompletionView.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/EncryptKeyCompletionView.java
@@ -18,6 +18,7 @@
 
 package org.sufficientlysecure.keychain.ui.widget;
 
+
 import android.content.Context;
 import android.database.Cursor;
 import android.graphics.Rect;
@@ -37,7 +38,6 @@ import android.view.inputmethod.InputMethodManager;
 import android.widget.TextView;
 
 import com.tokenautocomplete.TokenCompleteTextView;
-
 import org.sufficientlysecure.keychain.Constants;
 import org.sufficientlysecure.keychain.R;
 import org.sufficientlysecure.keychain.provider.KeychainContract;
@@ -55,7 +55,6 @@ public class EncryptKeyCompletionView extends TokenCompleteTextView<KeyItem>
 
     private KeyAdapter mAdapter;
     private LoaderManager mLoaderManager;
-    private CharSequence mPrefix;
 
     public EncryptKeyCompletionView(Context context) {
         super(context);
@@ -73,20 +72,12 @@ public class EncryptKeyCompletionView extends TokenCompleteTextView<KeyItem>
     }
 
     private void initView() {
-        setPrefix(getContext().getString(R.string.label_to) + " ");
-
         allowDuplicates(false);
+
         mAdapter = new KeyAdapter(getContext(), null, 0);
         setAdapter(mAdapter);
     }
 
-    @Override
-    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(KeyItem keyItem) {
         LayoutInflater l = LayoutInflater.from(getContext());
@@ -173,13 +164,10 @@ public class EncryptKeyCompletionView extends TokenCompleteTextView<KeyItem>
 
     @Override
     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();
-        }
+//        super.performFiltering(text, start, end, keyCode);
         String query = text.subSequence(start, end).toString();
         if (TextUtils.isEmpty(query) || query.length() < 2) {
-            mLoaderManager.destroyLoader(0);
+            mAdapter.swapCursor(null);
             return;
         }
         Bundle args = new Bundle();
-- 
cgit v1.2.3