diff options
author | Daniel Albert <albert_daniel@t-online.de> | 2014-07-16 18:49:16 +0200 |
---|---|---|
committer | Daniel Albert <albert_daniel@t-online.de> | 2014-07-16 18:49:16 +0200 |
commit | d63534d6559f846b670f07bcc99fdd85ebe9cb3a (patch) | |
tree | 85d0135e80668347f5438ef4f85e134049491e8c /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/WrappedKeyRing.java | |
parent | e375cde7e1a09df33c65a44ba57f3f75f2f98b15 (diff) | |
parent | 82af9672fdc7f548eb801c29d123c824ea286cdc (diff) | |
download | open-keychain-d63534d6559f846b670f07bcc99fdd85ebe9cb3a.tar.gz open-keychain-d63534d6559f846b670f07bcc99fdd85ebe9cb3a.tar.bz2 open-keychain-d63534d6559f846b670f07bcc99fdd85ebe9cb3a.zip |
Merge remote-tracking branch 'upstream/master'
Conflicts:
OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/WrappedKeyRing.java')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/WrappedKeyRing.java | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/WrappedKeyRing.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/WrappedKeyRing.java index 6f3068261..a054255dc 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/WrappedKeyRing.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/WrappedKeyRing.java @@ -39,8 +39,12 @@ public abstract class WrappedKeyRing extends KeyRing { } public String getPrimaryUserId() throws PgpGeneralException { - return (String) getRing().getPublicKey().getUserIDs().next(); - }; + return getPublicKey().getPrimaryUserId(); + } + + public String getPrimaryUserIdWithFallback() throws PgpGeneralException { + return getPublicKey().getPrimaryUserIdWithFallback(); + } public boolean isRevoked() throws PgpGeneralException { // Is the master key revoked? @@ -101,8 +105,16 @@ public abstract class WrappedKeyRing extends KeyRing { abstract public IterableIterator<WrappedPublicKey> publicKeyIterator(); - public UncachedKeyRing getUncached() { - return new UncachedKeyRing(getRing()); + public WrappedPublicKey getPublicKey() { + return new WrappedPublicKey(this, getRing().getPublicKey()); + } + + public WrappedPublicKey getPublicKey(long id) { + return new WrappedPublicKey(this, getRing().getPublicKey(id)); + } + + public byte[] getEncoded() throws IOException { + return getRing().getEncoded(); } } |