From cb1527e2a1a790455b4d2e2041ed07accbe3c80f Mon Sep 17 00:00:00 2001 From: Vincent Breitmoser Date: Mon, 30 Nov 2015 19:01:06 +0100 Subject: encryptkeycompletionview: don't initialize to null on attach --- .../keychain/ui/EncryptModeAsymmetricFragment.java | 6 +++--- .../keychain/ui/widget/EncryptKeyCompletionView.java | 9 --------- 2 files changed, 3 insertions(+), 12 deletions(-) (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain') diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptModeAsymmetricFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptModeAsymmetricFragment.java index 355c649e7..bf4713fb4 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptModeAsymmetricFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptModeAsymmetricFragment.java @@ -91,16 +91,16 @@ public class EncryptModeAsymmetricFragment extends EncryptModeFragment { }); final ViewAnimator vEncryptionIcon = (ViewAnimator) view.findViewById(R.id.result_encryption_icon); - mEncryptKeyView.setTokenListener(new TokenListener() { + mEncryptKeyView.setTokenListener(new TokenListener() { @Override - public void onTokenAdded(Object o) { + public void onTokenAdded(KeyItem o) { if (vEncryptionIcon.getDisplayedChild() != 1) { vEncryptionIcon.setDisplayedChild(1); } } @Override - public void onTokenRemoved(Object o) { + public void onTokenRemoved(KeyItem o) { int child = mEncryptKeyView.getObjects().isEmpty() ? 0 : 1; if (vEncryptionIcon.getDisplayedChild() != child) { vEncryptionIcon.setDisplayedChild(child); 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 01d51af48..c812edf71 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 @@ -110,7 +110,6 @@ public class EncryptKeyCompletionView extends TokenCompleteTextView if (getContext() instanceof FragmentActivity) { mLoaderManager = ((FragmentActivity) getContext()).getSupportLoaderManager(); - mLoaderManager.initLoader(0, null, this); } else { Log.e(Constants.TAG, "EncryptKeyCompletionView must be attached to a FragmentActivity, this is " + getContext().getClass()); } @@ -135,12 +134,6 @@ public class EncryptKeyCompletionView extends TokenCompleteTextView + KeyRings.IS_EXPIRED + " = 0 AND " + Tables.KEYS + "." + KeyRings.IS_REVOKED + " = 0"; - if (args == null || !args.containsKey(ARG_QUERY)) { - // mAdapter.setSearchQuery(null); - // return new CursorLoader(getContext(), baseUri, projection, where, null, null); - return null; - } - String query = args.getString(ARG_QUERY); mAdapter.setSearchQuery(query); @@ -169,8 +162,6 @@ public class EncryptKeyCompletionView extends TokenCompleteTextView super.showDropDown(); } - - @Override public void onFocusChanged(boolean hasFocus, int direction, Rect previous) { super.onFocusChanged(hasFocus, direction, previous); -- cgit v1.2.3