fix nullpointer, cleanup

1 files changed, 2 insertions, 3 deletions

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SubkeysAdapter.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SubkeysAdapter.java
index f5f4b32e6..02b1f31e2 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SubkeysAdapter.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SubkeysAdapter.java
@@ -42,7 +42,7 @@ public class SubkeysAdapter extends CursorAdapter {
 
     private ColorStateList mDefaultTextColor;
 
-    public static final String[] KEYS_PROJECTION = new String[]{
+    public static final String[] SUBKEYS_PROJECTION = new String[]{
             Keys._ID,
             Keys.KEY_ID,
             Keys.RANK,
@@ -80,8 +80,7 @@ public class SubkeysAdapter extends CursorAdapter {
     @Override
     public Cursor swapCursor(Cursor newCursor) {
         hasAnySecret = false;
-        if (newCursor != null) {
-            newCursor.moveToFirst();
+        if (newCursor != null && newCursor.moveToFirst()) {
             do {
                 if (newCursor.getInt(INDEX_HAS_SECRET) != 0) {
                     hasAnySecret = true;