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

Fix nullpointer when trying to delete keys or resuming from key import. Uups...

Browse Source
This commit is contained in:
Tobias Erthal
2016-09-10 13:16:29 +02:00
parent d06eae018a
commit d67ffb4fbb
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeySectionedListAdapter.java
View File

@@ -120,7 +120,8 @@ public class KeySectionedListAdapter extends SectionCursorAdapter<KeySectionedLi
public long[] getSelectedMasterKeyIds() { public long[] getSelectedMasterKeyIds() {
long[] keys = new long[mSelected.size()]; long[] keys = new long[mSelected.size()];
for(int i = 0; i < keys.length; i++) { for(int i = 0; i < keys.length; i++) {
if(!moveCursor(mSelected.get(i))) { int index = getCursorPositionWithoutSections(mSelected.get(i));
if(!moveCursor(index)) {
return keys; return keys;
} }
@@ -132,7 +133,8 @@ public class KeySectionedListAdapter extends SectionCursorAdapter<KeySectionedLi
public boolean isAnySecretKeySelected() { public boolean isAnySecretKeySelected() {
for(int i = 0; i < mSelected.size(); i++) { for(int i = 0; i < mSelected.size(); i++) {
if(!moveCursor(mSelected.get(i))) { int index = getCursorPositionWithoutSections(mSelected.get(i));
if(!moveCursor(index)) {
return false; return false;
} }

2
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/recyclerview/RecyclerFragment.java
View File

@@ -174,7 +174,7 @@ public class RecyclerFragment<A extends RecyclerView.Adapter> extends Fragment {
@Override @Override
public void onDestroy() { public void onDestroy() {
setAdapter(null); //setAdapter(null);
super.onDestroy(); super.onDestroy();
} }