diff options
author | Alex Fong <alexfongg@gmail.com> | 2016-04-17 11:34:08 +0800 |
---|---|---|
committer | Alex Fong <alexfongg@gmail.com> | 2016-05-05 07:57:20 +0800 |
commit | f43edcdd7afb1692fab1239c54c3cd535506c9e1 (patch) | |
tree | 756ae259f9d573a12dc1c5ca8e64250a015ee616 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations | |
parent | dfcde9242d7b39bf1ab9f0b66fc5829fb0af0f8c (diff) | |
download | open-keychain-f43edcdd7afb1692fab1239c54c3cd535506c9e1.tar.gz open-keychain-f43edcdd7afb1692fab1239c54c3cd535506c9e1.tar.bz2 open-keychain-f43edcdd7afb1692fab1239c54c3cd535506c9e1.zip |
Refactoring: Removed PassphraseChangeParcel and placed its functionality into ChangeUnlockParcel.
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/ChangeUnlockOperation.java (renamed from OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/PassphraseChangeOperation.java) | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/PassphraseChangeOperation.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/ChangeUnlockOperation.java index 2904c9b5a..b16957e25 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/PassphraseChangeOperation.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/ChangeUnlockOperation.java @@ -13,25 +13,24 @@ import org.sufficientlysecure.keychain.pgp.PgpKeyOperation; import org.sufficientlysecure.keychain.pgp.Progressable; import org.sufficientlysecure.keychain.pgp.UncachedKeyRing; import org.sufficientlysecure.keychain.provider.ProviderHelper; -import org.sufficientlysecure.keychain.service.PassphraseChangeParcel; +import org.sufficientlysecure.keychain.service.ChangeUnlockParcel; import org.sufficientlysecure.keychain.service.input.CryptoInputParcel; import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils; import org.sufficientlysecure.keychain.util.ProgressScaler; -public class PassphraseChangeOperation extends BaseOperation<PassphraseChangeParcel> { +public class ChangeUnlockOperation extends BaseOperation<ChangeUnlockParcel> { - - public PassphraseChangeOperation(Context context, ProviderHelper providerHelper, Progressable progressable) { + public ChangeUnlockOperation(Context context, ProviderHelper providerHelper, Progressable progressable) { super(context, providerHelper, progressable); } @NonNull - public OperationResult execute(PassphraseChangeParcel passphraseParcel, CryptoInputParcel cryptoInput) { + public OperationResult execute(ChangeUnlockParcel unlockParcel, CryptoInputParcel cryptoInput) { OperationResult.OperationLog log = new OperationResult.OperationLog(); log.add(OperationResult.LogType.MSG_ED, 0); - if (passphraseParcel == null || passphraseParcel.mMasterKeyId == null) { + if (unlockParcel == null || unlockParcel.mMasterKeyId == null) { log.add(OperationResult.LogType.MSG_ED_ERROR_NO_PARCEL, 1); return new EditKeyResult(EditKeyResult.RESULT_ERROR, log, null); } @@ -44,11 +43,11 @@ public class PassphraseChangeOperation extends BaseOperation<PassphraseChangePar try { log.add(OperationResult.LogType.MSG_ED_FETCHING, 1, - KeyFormattingUtils.convertKeyIdToHex(passphraseParcel.mMasterKeyId)); + KeyFormattingUtils.convertKeyIdToHex(unlockParcel.mMasterKeyId)); CanonicalizedSecretKeyRing secRing = - mProviderHelper.getCanonicalizedSecretKeyRing(passphraseParcel.mMasterKeyId); - modifyResult = keyOperations.modifyKeyRingPassphrase(secRing, cryptoInput, passphraseParcel); + mProviderHelper.getCanonicalizedSecretKeyRing(unlockParcel.mMasterKeyId); + modifyResult = keyOperations.modifyKeyRingPassphrase(secRing, cryptoInput, unlockParcel); if (modifyResult.isPending()) { // obtain original passphrase from user |