diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-07-15 19:47:40 +0200 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-07-15 19:47:52 +0200 |
commit | 64b87f75be6e9d47ef2e799c8899cc00b751f528 (patch) | |
tree | 8d3aebdc845463f4cdd83ae406ca027b5f8063a1 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java | |
parent | 848043a48131dd9872d2502318570f3a1f0702a3 (diff) | |
download | open-keychain-64b87f75be6e9d47ef2e799c8899cc00b751f528.tar.gz open-keychain-64b87f75be6e9d47ef2e799c8899cc00b751f528.tar.bz2 open-keychain-64b87f75be6e9d47ef2e799c8899cc00b751f528.zip |
move getPublicKey into abstract WrappedKeyRing (also, fix getPrimaryUserId)
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java index 991c9f3a8..2d524f5b0 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java @@ -199,7 +199,7 @@ public class ProviderHelper { byte[] blob = cursor.getBlob(3); if (blob != null) { result.put(masterKeyId, - new WrappedPublicKeyRing(blob, hasAnySecret, verified).getSubkey()); + new WrappedPublicKeyRing(blob, hasAnySecret, verified).getPublicKey()); } } while (cursor.moveToNext()); |