fix nullpointerexception in importkeyactivity
This commit is contained in:
@@ -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;
|
||||
|
||||
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user