diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-10-08 20:05:56 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-10-08 20:05:56 +0200 |
| commit | 6cf7e3e541ff954f5f9065ab52e6cee93c0643d3 (patch) | |
| tree | 090937fb456a6fa594a49cafffd1de01a3c35e48 /OpenKeychain/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringMergeTest.java | |
| parent | 7619083d5c0a7a2ca0c6ed4a6f8317b31ca005f5 (diff) | |
| parent | ba9b8f3a6009ca60abffccc3e3fbd160e0fa420c (diff) | |
| download | open-keychain-6cf7e3e541ff954f5f9065ab52e6cee93c0643d3.tar.gz open-keychain-6cf7e3e541ff954f5f9065ab52e6cee93c0643d3.tar.bz2 open-keychain-6cf7e3e541ff954f5f9065ab52e6cee93c0643d3.zip | |
Merge branch 'master' into encrypted-export
Diffstat (limited to 'OpenKeychain/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringMergeTest.java')
| -rw-r--r-- | OpenKeychain/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringMergeTest.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringMergeTest.java b/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringMergeTest.java index 90189e377..59397e642 100644 --- a/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringMergeTest.java +++ b/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringMergeTest.java @@ -87,8 +87,8 @@ public class UncachedKeyringMergeTest { static UncachedKeyRing staticRingA, staticRingB; UncachedKeyRing ringA, ringB; - ArrayList<RawPacket> onlyA = new ArrayList<RawPacket>(); - ArrayList<RawPacket> onlyB = new ArrayList<RawPacket>(); + ArrayList<RawPacket> onlyA = new ArrayList<>(); + ArrayList<RawPacket> onlyB = new ArrayList<>(); OperationResult.OperationLog log = new OperationResult.OperationLog(); PgpKeyOperation op; SaveKeyringParcel parcel; @@ -234,7 +234,7 @@ public class UncachedKeyringMergeTest { parcel.reset(); parcel.mAddSubKeys.add(new SaveKeyringParcel.SubkeyAdd( - Algorithm.RSA, 1024, null, KeyFlags.SIGN_DATA, 0L)); + Algorithm.RSA, 2048, null, KeyFlags.SIGN_DATA, 0L)); modifiedA = op.modifySecretKeyRing(secretRing, new CryptoInputParcel(new Date(), new Passphrase()), parcel).getRing(); modifiedB = op.modifySecretKeyRing(secretRing, new CryptoInputParcel(new Date(), new Passphrase()), parcel).getRing(); |