diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-03-06 21:59:56 +0100 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-03-06 21:59:56 +0100 |
commit | 3d944483d3a255f6dd707cf72eeb772789ec9ecd (patch) | |
tree | e1e37dcdf4eea2828fb7f8a11944c20776ed32cf /OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/PassphraseDialogFragment.java | |
parent | 9edd4bee700d7710fc477d8608c7c36af8ec8da0 (diff) | |
parent | 8e29b82d6daa689f07a8318bf194c8fb17133c95 (diff) | |
download | open-keychain-3d944483d3a255f6dd707cf72eeb772789ec9ecd.tar.gz open-keychain-3d944483d3a255f6dd707cf72eeb772789ec9ecd.tar.bz2 open-keychain-3d944483d3a255f6dd707cf72eeb772789ec9ecd.zip |
Merge pull request #344 from ankushb92/ankush2
#338
Diffstat (limited to 'OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/PassphraseDialogFragment.java')
-rw-r--r-- | OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/PassphraseDialogFragment.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/PassphraseDialogFragment.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/PassphraseDialogFragment.java index e88271240..c00232fd1 100644 --- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/PassphraseDialogFragment.java +++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/PassphraseDialogFragment.java @@ -153,7 +153,7 @@ public class PassphraseDialogFragment extends DialogFragment implements OnEditor dismiss(); long curKeyIndex = 1; boolean keyOK = true; - String passPhrase = mPassphraseEditText.getText().toString(); + String passphrase = mPassphraseEditText.getText().toString(); long keyId; PGPSecretKey clickSecretKey = secretKey; @@ -163,7 +163,7 @@ public class PassphraseDialogFragment extends DialogFragment implements OnEditor try { PBESecretKeyDecryptor keyDecryptor = new JcePBESecretKeyDecryptorBuilder() .setProvider(Constants.BOUNCY_CASTLE_PROVIDER_NAME).build( - passPhrase.toCharArray()); + passphrase.toCharArray()); PGPPrivateKey testKey = clickSecretKey .extractPrivateKey(keyDecryptor); if (testKey == null) { @@ -206,10 +206,10 @@ public class PassphraseDialogFragment extends DialogFragment implements OnEditor // cache the new passphrase Log.d(Constants.TAG, "Everything okay! Caching entered passphrase"); - PassphraseCacheService.addCachedPassphrase(activity, keyId, passPhrase); + PassphraseCacheService.addCachedPassphrase(activity, keyId, passphrase); if (keyOK == false && clickSecretKey.getKeyID() != keyId) { PassphraseCacheService.addCachedPassphrase(activity, clickSecretKey.getKeyID(), - passPhrase); + passphrase); } sendMessageToHandler(MESSAGE_OKAY); |