aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2014-07-10 01:38:57 +0200
committerVincent Breitmoser <valodim@mugenguild.com>2014-07-10 01:38:57 +0200
commit90f546a4e877972d6686745aabfac1fca1178b8c (patch)
tree67ea73808bc4577009ff8d2f9bd9a8e3e7e46ae5 /OpenKeychain
parent0afd979665ca17ece970df5a5f0b466346be72f1 (diff)
downloadopen-keychain-90f546a4e877972d6686745aabfac1fca1178b8c.tar.gz
open-keychain-90f546a4e877972d6686745aabfac1fca1178b8c.tar.bz2
open-keychain-90f546a4e877972d6686745aabfac1fca1178b8c.zip
tests: add testSubkeyAdd
Diffstat (limited to 'OpenKeychain')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/WrappedKeyRing.java4
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java1
2 files changed, 5 insertions, 0 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..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());
}
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java
index 5a778a19d..e0d11dafa 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java
@@ -325,6 +325,7 @@ public class OperationResultParcel implements Parcelable {
}
public void add(LogLevel level, LogType type, int indent) {
+ Log.d(Constants.TAG, type.toString());
parcels.add(new OperationResultParcel.LogEntryParcel(level, type, indent, (Object[]) null));
}