moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-11-06 17:25:05 -05:00
Code Issues Releases Wiki Activity

Merge branch 'certify' into certs

Browse Source 
Conflicts:
	OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java
	OpenPGP-Keychain/src/main/res/values/strings.xml
This commit is contained in:
Vincent Breitmoser 2014-03-17 14:18:42 +01:00
commit 5e4239a7b9
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -432,7 +432,7 @@ public class PgpKeyOperation {
// TODO: this only takes care of user id certificates, what about others? // TODO: this only takes care of user id certificates, what about others?
PGPPublicKey pubkey = publicKeyRing.getPublicKey(); PGPPublicKey pubkey = publicKeyRing.getPublicKey();
for(String uid : new IterableIterator<String>(pubkey.getUserIDs())) { for(String uid : new IterableIterator<String>(pubkey.getUserIDs())) {
for(PGPSignature sig : new IterableIterator<PGPSignature>(oldPublicKey.getSignaturesForID(uid))) { for(PGPSignature sig : new IterableIterator<PGPSignature>(oldPublicKey.getSignaturesForID(uid), true)) {
// but skip self certificates // but skip self certificates
if(sig.getKeyID() == pubkey.getKeyID()) if(sig.getKeyID() == pubkey.getKeyID())
continue; continue;

10
OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/IterableIterator.java
View File

@ -16,13 +16,21 @@
package org.sufficientlysecure.keychain.util; package org.sufficientlysecure.keychain.util;
import java.util.ArrayList;
import java.util.Iterator; import java.util.Iterator;
public class IterableIterator<T> implements Iterable<T> { public class IterableIterator<T> implements Iterable<T> {
private Iterator<T> mIter; private Iterator<T> mIter;
public IterableIterator(Iterator<T> iter) { public IterableIterator(Iterator<T> iter, boolean failsafe) {
mIter = iter; mIter = iter;
if(failsafe && mIter == null) {
// is there a better way?
mIter = new ArrayList<T>().iterator();
}
}
public IterableIterator(Iterator<T> iter) {
this(iter, false);
} }
public Iterator<T> iterator() { public Iterator<T> iterator() {