From 90f546a4e877972d6686745aabfac1fca1178b8c Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Thu, 10 Jul 2014 01:38:57 +0200
Subject: tests: add testSubkeyAdd

---
 .../main/java/org/sufficientlysecure/keychain/pgp/WrappedKeyRing.java | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/WrappedKeyRing.java')

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..73fd92a3a 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/WrappedKeyRing.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/WrappedKeyRing.java
@@ -101,6 +101,10 @@ public abstract class WrappedKeyRing extends KeyRing {
 
     abstract public IterableIterator<WrappedPublicKey> publicKeyIterator();
 
+    public byte[] getEncoded() throws IOException {
+        return getRing().getEncoded();
+    }
+
     public UncachedKeyRing getUncached() {
         return new UncachedKeyRing(getRing());
     }
-- 
cgit v1.2.3


From e477577c55cf9c30b749b467ab01fa2ff2ce8254 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Fri, 11 Jul 2014 02:50:35 +0200
Subject: some UncachedKeyRing fixes, primary user id mostly

---
 .../main/java/org/sufficientlysecure/keychain/pgp/WrappedKeyRing.java | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/WrappedKeyRing.java')

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 73fd92a3a..2fcd05204 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/WrappedKeyRing.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/WrappedKeyRing.java
@@ -105,8 +105,4 @@ public abstract class WrappedKeyRing extends KeyRing {
         return getRing().getEncoded();
     }
 
-    public UncachedKeyRing getUncached() {
-        return new UncachedKeyRing(getRing());
-    }
-
 }
-- 
cgit v1.2.3


From 64b87f75be6e9d47ef2e799c8899cc00b751f528 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Tue, 15 Jul 2014 19:47:40 +0200
Subject: move getPublicKey into abstract WrappedKeyRing (also, fix
 getPrimaryUserId)

---
 .../org/sufficientlysecure/keychain/pgp/WrappedKeyRing.java    | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/WrappedKeyRing.java')

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 2fcd05204..ba5ebea4a 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/WrappedKeyRing.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/WrappedKeyRing.java
@@ -39,7 +39,7 @@ public abstract class WrappedKeyRing extends KeyRing {
     }
 
     public String getPrimaryUserId() throws PgpGeneralException {
-        return (String) getRing().getPublicKey().getUserIDs().next();
+        return getPublicKey().getPrimaryUserId();
     };
 
     public boolean isRevoked() throws PgpGeneralException {
@@ -101,6 +101,14 @@ public abstract class WrappedKeyRing extends KeyRing {
 
     abstract public IterableIterator<WrappedPublicKey> publicKeyIterator();
 
+    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();
     }
-- 
cgit v1.2.3


From d3c54d5f129ca24cbfa08208fc5c79c626897d4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Wed, 16 Jul 2014 00:22:45 +0200
Subject: Fallback if no primary user id exists

---
 .../java/org/sufficientlysecure/keychain/pgp/WrappedKeyRing.java    | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/WrappedKeyRing.java')

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 ba5ebea4a..a054255dc 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/WrappedKeyRing.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/WrappedKeyRing.java
@@ -40,7 +40,11 @@ public abstract class WrappedKeyRing extends KeyRing {
 
     public String getPrimaryUserId() throws PgpGeneralException {
         return getPublicKey().getPrimaryUserId();
-    };
+    }
+
+    public String getPrimaryUserIdWithFallback() throws PgpGeneralException {
+        return getPublicKey().getPrimaryUserIdWithFallback();
+    }
 
     public boolean isRevoked() throws PgpGeneralException {
         // Is the master key revoked?
-- 
cgit v1.2.3