From 13a13829a8b8ad49237fb9bc8bb5a03ff5a4cce4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Wed, 2 Jul 2014 16:47:12 +0200
Subject: fix nullpointer, cleanup

---
 .../org/sufficientlysecure/keychain/ui/adapter/SubkeysAdapter.java   | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SubkeysAdapter.java')

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;
-- 
cgit v1.2.3