fix nullpointerexception in importkeyactivity

This commit is contained in:
Vincent Breitmoser
2014-06-28 20:12:50 +02:00
parent 0067cdf221
commit 3acb7fb087
3 changed files with 20 additions and 3 deletions

View File

@@ -428,9 +428,14 @@ public class ImportKeysActivity extends ActionBarActivity {
if (message.arg1 == KeychainIntentServiceHandler.MESSAGE_OKAY) {
// get returned data bundle
Bundle returnData = message.getData();
if (returnData == null) {
return;
}
final ImportResult result =
returnData.getParcelable(KeychainIntentService.RESULT);
if (result == null) {
return;
}
int resultType = result.getResult();
String str;

View File

@@ -85,6 +85,10 @@ public class ImportKeysAdapter extends ArrayAdapter<ImportKeysListEntry> {
public ArrayList<ImportKeysListEntry> getSelectedEntries() {
ArrayList<ImportKeysListEntry> selectedData = new ArrayList<ImportKeysListEntry>();
// Nothing to select, nvm.
if (mData == null) {
return selectedData;
}
for (ImportKeysListEntry entry : mData) {
if (entry.isSelected()) {
selectedData.add(entry);