diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-09-14 01:14:58 +0200 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-09-14 01:14:58 +0200 |
commit | 36ef8a9a62f32f0843c9e317d493a7f136624dce (patch) | |
tree | 7d139791b132f62397ad09d41b8b24cde0a436b7 /OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringMergeTest.java | |
parent | 03d103af0722540c0f636c139fac33d3ffb28a34 (diff) | |
download | open-keychain-36ef8a9a62f32f0843c9e317d493a7f136624dce.tar.gz open-keychain-36ef8a9a62f32f0843c9e317d493a7f136624dce.tar.bz2 open-keychain-36ef8a9a62f32f0843c9e317d493a7f136624dce.zip |
work on OperationResultParcel
Diffstat (limited to 'OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringMergeTest.java')
-rw-r--r-- | OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringMergeTest.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringMergeTest.java b/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringMergeTest.java index 8cfed42e4..789e1bbb1 100644 --- a/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringMergeTest.java +++ b/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringMergeTest.java @@ -32,7 +32,7 @@ import org.spongycastle.bcpg.SecretKeyPacket; import org.spongycastle.bcpg.sig.KeyFlags; import org.spongycastle.jce.provider.BouncyCastleProvider; import org.spongycastle.util.Strings; -import org.sufficientlysecure.keychain.service.results.OperationResultParcel; +import org.sufficientlysecure.keychain.service.results.OperationResult; import org.sufficientlysecure.keychain.service.results.EditKeyResult; import org.sufficientlysecure.keychain.service.SaveKeyringParcel; import org.sufficientlysecure.keychain.service.SaveKeyringParcel.Algorithm; @@ -77,7 +77,7 @@ public class UncachedKeyringMergeTest { UncachedKeyRing ringA, ringB; ArrayList<RawPacket> onlyA = new ArrayList<RawPacket>(); ArrayList<RawPacket> onlyB = new ArrayList<RawPacket>(); - OperationResultParcel.OperationLog log = new OperationResultParcel.OperationLog(); + OperationResult.OperationLog log = new OperationResult.OperationLog(); PgpKeyOperation op; SaveKeyringParcel parcel; @@ -99,7 +99,7 @@ public class UncachedKeyringMergeTest { parcel.mNewPassphrase = ""; PgpKeyOperation op = new PgpKeyOperation(null); - OperationResultParcel.OperationLog log = new OperationResultParcel.OperationLog(); + OperationResult.OperationLog log = new OperationResult.OperationLog(); EditKeyResult result = op.createSecretKeyRing(parcel); staticRingA = result.getRing(); @@ -115,7 +115,7 @@ public class UncachedKeyringMergeTest { parcel.mNewPassphrase = ""; PgpKeyOperation op = new PgpKeyOperation(null); - OperationResultParcel.OperationLog log = new OperationResultParcel.OperationLog(); + OperationResult.OperationLog log = new OperationResult.OperationLog(); EditKeyResult result = op.createSecretKeyRing(parcel); staticRingB = result.getRing(); } |