diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-06-04 20:27:25 +0200 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-06-04 20:27:25 +0200 |
commit | cc1e4dce0a71161911091ff7c2bfa0947642cd79 (patch) | |
tree | 0ed52004db9d107c6e0f30b6c1db35555d7b3bfb /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/WrappedSecretKeyRing.java | |
parent | 52f1f30846ad7efa6e6ae11ed96f5b68626bfb3b (diff) | |
download | open-keychain-cc1e4dce0a71161911091ff7c2bfa0947642cd79.tar.gz open-keychain-cc1e4dce0a71161911091ff7c2bfa0947642cd79.tar.bz2 open-keychain-cc1e4dce0a71161911091ff7c2bfa0947642cd79.zip |
neatness refactoring
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/WrappedSecretKeyRing.java')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/WrappedSecretKeyRing.java | 24 |
1 files changed, 22 insertions, 2 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/WrappedSecretKeyRing.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/WrappedSecretKeyRing.java index 91d4286f4..9591cf8bc 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/WrappedSecretKeyRing.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/WrappedSecretKeyRing.java @@ -4,7 +4,7 @@ import org.spongycastle.openpgp.PGPException; import org.spongycastle.openpgp.PGPKeyRing; import org.spongycastle.openpgp.PGPObjectFactory; import org.spongycastle.openpgp.PGPPrivateKey; -import org.spongycastle.openpgp.PGPPublicKeyRing; +import org.spongycastle.openpgp.PGPPublicKey; import org.spongycastle.openpgp.PGPSecretKey; import org.spongycastle.openpgp.PGPSecretKeyRing; import org.spongycastle.openpgp.operator.PBESecretKeyDecryptor; @@ -114,7 +114,7 @@ public class WrappedSecretKeyRing extends WrappedKeyRing { } - public IterableIterator<WrappedSecretKey> iterator() { + public IterableIterator<WrappedSecretKey> secretKeyIterator() { final Iterator<PGPSecretKey> it = mRing.getSecretKeys(); return new IterableIterator<WrappedSecretKey>(new Iterator<WrappedSecretKey>() { @Override @@ -134,6 +134,26 @@ public class WrappedSecretKeyRing extends WrappedKeyRing { }); } + public IterableIterator<WrappedPublicKey> publicKeyIterator() { + final Iterator<PGPPublicKey> it = getRing().getPublicKeys(); + return new IterableIterator<WrappedPublicKey>(new Iterator<WrappedPublicKey>() { + @Override + public boolean hasNext() { + return it.hasNext(); + } + + @Override + public WrappedPublicKey next() { + return new WrappedPublicKey(WrappedSecretKeyRing.this, it.next()); + } + + @Override + public void remove() { + it.remove(); + } + }); + } + public UncachedKeyRing getUncached() { return new UncachedKeyRing(mRing); } |