From 24ef87535f922354e4f468496c1577d0329b23f8 Mon Sep 17 00:00:00 2001 From: Vincent Breitmoser Date: Tue, 29 Dec 2015 00:17:13 +0100 Subject: keylist: filter results by all user ids for search (fixes #1645) --- .../keychain/ui/KeyListFragment.java | 25 ++++++---------------- 1 file changed, 6 insertions(+), 19 deletions(-) (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java') diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java index dd8107304..77139f5de 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java @@ -305,27 +305,16 @@ public class KeyListFragment extends LoaderFragment public Loader onCreateLoader(int id, Bundle args) { // This is called when a new Loader needs to be created. This // sample only has one Loader, so we don't care about the ID. - Uri baseUri = KeyRings.buildUnifiedKeyRingsUri(); - String where = null; - String whereArgs[] = null; - if (mQuery != null) { - String[] words = mQuery.trim().split("\\s+"); - whereArgs = new String[words.length]; - for (int i = 0; i < words.length; ++i) { - if (where == null) { - where = ""; - } else { - where += " AND "; - } - where += KeyRings.USER_ID + " LIKE ?"; - whereArgs[i] = "%" + words[i] + "%"; - } + Uri uri; + if (!TextUtils.isEmpty(mQuery)) { + uri = KeyRings.buildUnifiedKeyRingsFindByUserIdUri(mQuery); + } else { + uri = KeyRings.buildUnifiedKeyRingsUri(); } // Now create and return a CursorLoader that will take care of // creating a Cursor for the data being displayed. - return new CursorLoader(getActivity(), baseUri, - KeyListAdapter.PROJECTION, where, whereArgs, ORDER); + return new CursorLoader(getActivity(), uri, KeyListAdapter.PROJECTION, null, null, ORDER); } @Override @@ -351,8 +340,6 @@ public class KeyListFragment extends LoaderFragment } mAdapter.swapCursor(data); - mStickyList.setAdapter(mAdapter); - // end action mode, if any if (mActionMode != null) { mActionMode.finish(); -- cgit v1.2.3