diff options
author | Alex Fong <alexfongg@gmail.com> | 2016-03-15 20:59:42 +0800 |
---|---|---|
committer | Alex Fong <alexfongg@gmail.com> | 2016-05-05 07:56:26 +0800 |
commit | b490be9c1c979fd4a75b5844fb68b0179bcfe598 (patch) | |
tree | 3f6a5c8924d2fd3a3fb2378224d6425a1e50940a /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/PassphraseChangeOperation.java | |
parent | 525788359c6821a958ee7306ef3aa34d7b211a6f (diff) | |
download | open-keychain-b490be9c1c979fd4a75b5844fb68b0179bcfe598.tar.gz open-keychain-b490be9c1c979fd4a75b5844fb68b0179bcfe598.tar.bz2 open-keychain-b490be9c1c979fd4a75b5844fb68b0179bcfe598.zip |
Refactored code to use functions already present in code, reduced liberties taken when modifying functions.
Todo:
Fix indentation for error messages
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/PassphraseChangeOperation.java')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/PassphraseChangeOperation.java | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/PassphraseChangeOperation.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/PassphraseChangeOperation.java index e95f35c21..fff4ef534 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/PassphraseChangeOperation.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/PassphraseChangeOperation.java @@ -63,15 +63,6 @@ public class PassphraseChangeOperation extends BaseOperation<PassphraseChangePar CanonicalizedSecretKeyRing secRing = mProviderHelper.getCanonicalizedSecretKeyRing(passphraseParcel.mMasterKeyId); - CachedPublicKeyRing cachedRing = - mProviderHelper.getCachedPublicKeyRing(passphraseParcel.mMasterKeyId); - - passphraseParcel.mValidSubkeyId = getFirstValidKeyId(secRing, cachedRing); - - if(passphraseParcel.mValidSubkeyId == null) { - log.add(OperationResult.LogType.MSG_MF_ERROR_ALL_KEYS_STRIPPED, 0); - return new EditKeyResult(EditKeyResult.RESULT_ERROR, log, null); - } modifyResult = keyOperations.modifyKeyRingPassword(secRing, cryptoInput, passphraseParcel); @@ -119,23 +110,4 @@ public class PassphraseChangeOperation extends BaseOperation<PassphraseChangePar } - private static Long getFirstValidKeyId (CanonicalizedSecretKeyRing secRing, CachedPublicKeyRing cachedRing) { - - Iterator<CanonicalizedSecretKey> secretKeyIterator = secRing.secretKeyIterator().iterator(); - - while(secretKeyIterator.hasNext()) { - try { - long keyId = secretKeyIterator.next().getKeyId(); - CanonicalizedSecretKey.SecretKeyType keyType = cachedRing.getSecretKeyType(keyId); - if( keyType == CanonicalizedSecretKey.SecretKeyType.PASSPHRASE - || keyType == CanonicalizedSecretKey.SecretKeyType.PASSPHRASE_EMPTY) { - return keyId; - } - } catch (ProviderHelper.NotFoundException e) { - ; - } - } - - return null; - } } |