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

sort out saving empty string IDs

Browse Source
This commit is contained in:
Ashley Hughes
2014-04-01 23:02:35 +01:00
parent d8001f9bbd
commit abfe416503
1 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java
View File

@@ -478,9 +478,7 @@ public class PgpKeyOperation {
PGPSignature certification = sGen.generateCertification(userId, masterPublicKey); PGPSignature certification = sGen.generateCertification(userId, masterPublicKey);
sigList.add(new Pair<String, PGPSignature>(userId, certification)); sigList.add(new Pair<String, PGPSignature>(userId, certification));
} }
if (!origID.equals("")) { masterPublicKey = PGPPublicKey.removeCertification(masterPublicKey, origID);
masterPublicKey = PGPPublicKey.removeCertification(masterPublicKey, origID);
}
userIDIndex++; userIDIndex++;
} }
for (Pair<String, PGPSignature> toAdd : sigList) { for (Pair<String, PGPSignature> toAdd : sigList) {
@@ -502,9 +500,7 @@ public class PgpKeyOperation {
sGen.setUnhashedSubpackets(unhashedPacketsGen.generate()); sGen.setUnhashedSubpackets(unhashedPacketsGen.generate());
} }
PGPSignature certification = sGen.generateCertification(userId, masterPublicKey); PGPSignature certification = sGen.generateCertification(userId, masterPublicKey);
if (!origID.equals("")) { masterPublicKey = PGPPublicKey.removeCertification(masterPublicKey, origID);
masterPublicKey = PGPPublicKey.removeCertification(masterPublicKey, origID);
}
masterPublicKey = PGPPublicKey.addCertification(masterPublicKey, userId, certification); masterPublicKey = PGPPublicKey.addCertification(masterPublicKey, userId, certification);
} }
userIDIndex++; userIDIndex++;
@@ -523,9 +519,7 @@ public class PgpKeyOperation {
sigList.add(new Pair<String, PGPSignature>(userId, sig)); sigList.add(new Pair<String, PGPSignature>(userId, sig));
} }
} }
if (!userId.equals("")) { masterPublicKey = PGPPublicKey.removeCertification(masterPublicKey, userId);
masterPublicKey = PGPPublicKey.removeCertification(masterPublicKey, userId);
}
userIDIndex++; userIDIndex++;
} }
anyIDChanged = true; anyIDChanged = true;