diff options
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/EditKeyOperation.java | 2 | ||||
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java | 9 | 
2 files changed, 3 insertions, 8 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/EditKeyOperation.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/EditKeyOperation.java index 469e386cb..da0aef018 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/EditKeyOperation.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/EditKeyOperation.java @@ -82,7 +82,7 @@ public class EditKeyOperation extends BaseOperation<SaveKeyringParcel> {                      CanonicalizedSecretKeyRing secRing =                              mProviderHelper.getCanonicalizedSecretKeyRing(saveParcel.mMasterKeyId); -                    modifyResult = keyOperations.modifySecretKeyRing(secRing, cryptoInput, saveParcel, log, 2); +                    modifyResult = keyOperations.modifySecretKeyRing(secRing, cryptoInput, saveParcel);                      if (modifyResult.isPending()) {                          return modifyResult;                      } diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java index 1da13023d..a018815f3 100644 --- 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  | 
