cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

display dummy key for empty result, don't display during search

Browse Source
This commit is contained in:
Vincent Breitmoser
2015-08-14 15:00:19 +02:00
parent b2d447ab32
commit 7004d129a8
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
View File

@@ -40,6 +40,7 @@ import android.support.v4.content.CursorLoader;
import android.support.v4.content.Loader; import android.support.v4.content.Loader;
import android.support.v4.view.MenuItemCompat; import android.support.v4.view.MenuItemCompat;
import android.support.v7.widget.SearchView; import android.support.v7.widget.SearchView;
import android.text.TextUtils;
import android.view.ActionMode; import android.view.ActionMode;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.Menu; import android.view.Menu;
@@ -300,8 +301,8 @@ public class KeyListFragment extends LoaderFragment
// old cursor once we return.) // old cursor once we return.)
mAdapter.setSearchQuery(mQuery); mAdapter.setSearchQuery(mQuery);
if (data != null && data.moveToFirst()) { if (data != null && (mQuery == null || TextUtils.isEmpty(mQuery))) {
boolean isSecret = data.getInt(KeyListAdapter.INDEX_HAS_ANY_SECRET) != 0; boolean isSecret = data.moveToFirst() && data.getInt(KeyListAdapter.INDEX_HAS_ANY_SECRET) != 0;
if (!isSecret) { if (!isSecret) {
MatrixCursor headerCursor = new MatrixCursor(KeyListAdapter.PROJECTION); MatrixCursor headerCursor = new MatrixCursor(KeyListAdapter.PROJECTION);
Long[] row = new Long[KeyListAdapter.PROJECTION.length]; Long[] row = new Long[KeyListAdapter.PROJECTION.length];