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

Fix nullpointer in ImportKeysListEntry

Browse Source
This commit is contained in:
Dominik Schürmann
2014-04-15 22:48:28 +02:00
parent 362a30c502
commit fdcc4c1d3d
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListEntry.java
View File

@@ -234,8 +234,9 @@ public class ImportKeysListEntry implements Serializable, Parcelable {
userIds = new ArrayList<String>(); userIds = new ArrayList<String>();
for (String userId : new IterableIterator<String>(key.getUserIDs())) { for (String userId : new IterableIterator<String>(key.getUserIDs())) {
userIds.add(userId); userIds.add(userId);
for(PGPSignature sig : new IterableIterator<PGPSignature>(key.getSignaturesForID(userId))) { for (PGPSignature sig : new IterableIterator<PGPSignature>(key.getSignaturesForID(userId))) {
if(sig.getHashedSubPackets().hasSubpacket(SignatureSubpacketTags.PRIMARY_USER_ID)) { if (sig.getHashedSubPackets() != null
&& sig.getHashedSubPackets().hasSubpacket(SignatureSubpacketTags.PRIMARY_USER_ID)) {
try { try {
// make sure it's actually valid // make sure it's actually valid
sig.init(new JcaPGPContentVerifierBuilderProvider().setProvider( sig.init(new JcaPGPContentVerifierBuilderProvider().setProvider(
@@ -243,7 +244,7 @@ public class ImportKeysListEntry implements Serializable, Parcelable {
if (sig.verifyCertification(userId, key)) { if (sig.verifyCertification(userId, key)) {
mPrimaryUserId = userId; mPrimaryUserId = userId;
} }
} catch(Exception e) { } catch (Exception e) {
// nothing bad happens, the key is just not considered the primary key id // nothing bad happens, the key is just not considered the primary key id
} }
} }
@@ -251,7 +252,7 @@ public class ImportKeysListEntry implements Serializable, Parcelable {
} }
} }
// if there was no user id flagged as primary, use the first one // if there was no user id flagged as primary, use the first one
if(mPrimaryUserId == null) { if (mPrimaryUserId == null) {
mPrimaryUserId = userIds.get(0); mPrimaryUserId = userIds.get(0);
} }
@@ -287,7 +288,7 @@ public class ImportKeysListEntry implements Serializable, Parcelable {
*/ */
public static String getAlgorithmFromId(int algorithmId) { public static String getAlgorithmFromId(int algorithmId) {
return (ALGORITHM_IDS.get(algorithmId) != null ? return (ALGORITHM_IDS.get(algorithmId) != null ?
ALGORITHM_IDS.get(algorithmId) : ALGORITHM_IDS.get(algorithmId) :
ALGORITHM_IDS.get(-1)); ALGORITHM_IDS.get(-1));
} }
} }