From d67ffb4fbb97a699fedbe1ac56a810f45ed804d6 Mon Sep 17 00:00:00 2001
From: Tobias Erthal <android@akgbensheim.de>
Date: Sat, 10 Sep 2016 13:16:29 +0200
Subject: [PATCH] Fix nullpointer when trying to delete keys or resuming from
 key import. Uups...

---
 .../keychain/ui/adapter/KeySectionedListAdapter.java        | 6 ++++--
 .../keychain/ui/util/recyclerview/RecyclerFragment.java     | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeySectionedListAdapter.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeySectionedListAdapter.java
index 521d24632..22c5e2911 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeySectionedListAdapter.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeySectionedListAdapter.java
@@ -120,7 +120,8 @@ public class KeySectionedListAdapter extends SectionCursorAdapter<KeySectionedLi
     public long[] getSelectedMasterKeyIds() {
         long[] keys = new long[mSelected.size()];
         for(int i = 0; i < keys.length; i++) {
-            if(!moveCursor(mSelected.get(i))) {
+            int index = getCursorPositionWithoutSections(mSelected.get(i));
+            if(!moveCursor(index)) {
                 return keys;
             }
 
@@ -132,7 +133,8 @@ public class KeySectionedListAdapter extends SectionCursorAdapter<KeySectionedLi
 
     public boolean isAnySecretKeySelected() {
         for(int i = 0; i < mSelected.size(); i++) {
-            if(!moveCursor(mSelected.get(i))) {
+            int index = getCursorPositionWithoutSections(mSelected.get(i));
+            if(!moveCursor(index)) {
                 return false;
             }
 
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/recyclerview/RecyclerFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/recyclerview/RecyclerFragment.java
index b6deb0362..bdc1913ae 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/recyclerview/RecyclerFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/recyclerview/RecyclerFragment.java
@@ -174,7 +174,7 @@ public class RecyclerFragment<A extends RecyclerView.Adapter> extends Fragment {
 
     @Override
     public void onDestroy() {
-        setAdapter(null);
+        //setAdapter(null);
         super.onDestroy();
     }