From b490be9c1c979fd4a75b5844fb68b0179bcfe598 Mon Sep 17 00:00:00 2001
From: Alex Fong <alexfongg@gmail.com>
Date: Tue, 15 Mar 2016 20:59:42 +0800
Subject: Refactored code to use functions already present in code, reduced
 liberties taken when modifying functions.

Todo:
Fix indentation for error messages
---
 .../operations/PassphraseChangeOperation.java      | 28 ----------------------
 1 file changed, 28 deletions(-)

(limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations')

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;
-    }
 }
-- 
cgit v1.2.3