Merge branch 'v/eventbus' into v/multi-decrypt

Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/CryptoOperationFragment.java

1 files changed, 5 insertions, 5 deletions

diff --git a/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/operations/CertifyOperationTest.java b/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/operations/CertifyOperationTest.java
index 65bb85712..115b253f8 100644
--- a/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/operations/CertifyOperationTest.java
+++ b/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/operations/CertifyOperationTest.java
@@ -156,7 +156,7 @@ public class CertifyOperationTest {
         CertifyActionsParcel actions = new CertifyActionsParcel(mStaticRing1.getMasterKeyId());
         actions.add(new CertifyAction(mStaticRing2.getMasterKeyId(),
                 mStaticRing2.getPublicKey().getUnorderedUserIds()));
-        CertifyResult result = op.execute(actions, new CryptoInputParcel(mKeyPhrase1), null);
+        CertifyResult result = op.execute(actions, new CryptoInputParcel(mKeyPhrase1));
 
         Assert.assertTrue("certification must succeed", result.success());
 
@@ -184,7 +184,7 @@ public class CertifyOperationTest {
         CertifyActionsParcel actions = new CertifyActionsParcel(mStaticRing1.getMasterKeyId());
         actions.add(new CertifyAction(mStaticRing2.getMasterKeyId(), null,
                 mStaticRing2.getPublicKey().getUnorderedUserAttributes()));
-        CertifyResult result = op.execute(actions, new CryptoInputParcel(mKeyPhrase1), null);
+        CertifyResult result = op.execute(actions, new CryptoInputParcel(mKeyPhrase1));
 
         Assert.assertTrue("certification must succeed", result.success());
 
@@ -207,7 +207,7 @@ public class CertifyOperationTest {
         actions.add(new CertifyAction(mStaticRing1.getMasterKeyId(),
                 mStaticRing2.getPublicKey().getUnorderedUserIds()));
 
-        CertifyResult result = op.execute(actions, new CryptoInputParcel(mKeyPhrase1), null);
+        CertifyResult result = op.execute(actions, new CryptoInputParcel(mKeyPhrase1));
 
         Assert.assertFalse("certification with itself must fail!", result.success());
         Assert.assertTrue("error msg must be about self certification",
@@ -226,7 +226,7 @@ public class CertifyOperationTest {
             uids.add("nonexistent");
             actions.add(new CertifyAction(1234L, uids));
 
-            CertifyResult result = op.execute(actions, new CryptoInputParcel(mKeyPhrase1), null);
+            CertifyResult result = op.execute(actions, new CryptoInputParcel(mKeyPhrase1));
 
             Assert.assertFalse("certification of nonexistent key must fail", result.success());
             Assert.assertTrue("must contain error msg about not found",
@@ -238,7 +238,7 @@ public class CertifyOperationTest {
             actions.add(new CertifyAction(mStaticRing1.getMasterKeyId(),
                     mStaticRing2.getPublicKey().getUnorderedUserIds()));
 
-            CertifyResult result = op.execute(actions, new CryptoInputParcel(mKeyPhrase1), null);
+            CertifyResult result = op.execute(actions, new CryptoInputParcel(mKeyPhrase1));
 
             Assert.assertFalse("certification of nonexistent key must fail", result.success());
             Assert.assertTrue("must contain error msg about not found",