move getPublicKey into abstract WrappedKeyRing (also, fix getPrimaryUserId)

2014-07-15 19:47:40 +02:00
parent 848043a481
commit 64b87f75be
9 changed files with 21 additions and 22 deletions
--- 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());