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/widget/SectionView.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/widget/SectionView.java')
-rw-r--r-- | OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/SectionView.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/SectionView.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/SectionView.java index a95d80a4e..47d6cd311 100644 --- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/SectionView.java +++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/SectionView.java @@ -220,18 +220,18 @@ public class SectionView extends LinearLayout implements OnClickListener, Editor Bundle data = new Bundle(); Boolean isMasterKey; - String passPhrase; + String passphrase; if (mEditors.getChildCount() > 0) { PGPSecretKey masterKey = ((KeyEditor) mEditors.getChildAt(0)).getValue(); - passPhrase = PassphraseCacheService + passphrase = PassphraseCacheService .getCachedPassphrase(mActivity, masterKey.getKeyID()); isMasterKey = false; } else { - passPhrase = ""; + passphrase = ""; isMasterKey = true; } data.putBoolean(KeychainIntentService.GENERATE_KEY_MASTER_KEY, isMasterKey); - data.putString(KeychainIntentService.GENERATE_KEY_SYMMETRIC_PASSPHRASE, passPhrase); + data.putString(KeychainIntentService.GENERATE_KEY_SYMMETRIC_PASSPHRASE, passphrase); data.putInt(KeychainIntentService.GENERATE_KEY_ALGORITHM, mNewKeyAlgorithmChoice.getId()); data.putInt(KeychainIntentService.GENERATE_KEY_KEY_SIZE, mNewKeySize); |