fix recursive log in modifySecretKeyRing

2015-06-15 03:33:19 +02:00
parent ae199313ee
commit b7834b4326
2 changed files with 3 additions and 8 deletions
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java
@@ -365,14 +365,9 @@ public class PgpKeyOperation {
    public PgpEditKeyResult modifySecretKeyRing(CanonicalizedSecretKeyRing wsKR,
                                                CryptoInputParcel cryptoInput,
                                                SaveKeyringParcel saveParcel) {
-        return modifySecretKeyRing(wsKR, cryptoInput, saveParcel, new OperationLog(), 0);
-    }

-    public PgpEditKeyResult modifySecretKeyRing(CanonicalizedSecretKeyRing wsKR,
-            CryptoInputParcel cryptoInput,
-            SaveKeyringParcel saveParcel,
-            OperationLog log,
-            int indent) {
+        OperationLog log = new OperationLog();
+        int indent = 0;

        /*
         * 1. Unlock private key