diff options
author | Thialfihar <thi@thialfihar.org> | 2014-04-02 15:31:03 +0200 |
---|---|---|
committer | Thialfihar <thi@thialfihar.org> | 2014-04-02 15:32:35 +0200 |
commit | 6ac13d9f6933bf72950910b0e2831761dd8c434b (patch) | |
tree | 69c52e8c990b1a1c4ca37a4e622c0c2bbdbac3a5 /OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java | |
parent | 62bd817f862dc71239419597920ecb1df41c4c52 (diff) | |
download | open-keychain-6ac13d9f6933bf72950910b0e2831761dd8c434b.tar.gz open-keychain-6ac13d9f6933bf72950910b0e2831761dd8c434b.tar.bz2 open-keychain-6ac13d9f6933bf72950910b0e2831761dd8c434b.zip |
Rename "pass phrase" to "passphrase"
Diffstat (limited to 'OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java')
-rw-r--r-- | OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java index 1c334e6d6..e9c949246 100644 --- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java +++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java @@ -488,16 +488,16 @@ public class KeychainIntentService extends IntentService try { /* Input */ SaveKeyringParcel saveParams = data.getParcelable(SAVE_KEYRING_PARCEL); - String oldPassPhrase = saveParams.oldPassPhrase; - String newPassPhrase = saveParams.newPassPhrase; + String oldPassphrase = saveParams.oldPassphrase; + String newPassphrase = saveParams.newPassphrase; boolean canSign = true; if (data.containsKey(SAVE_KEYRING_CAN_SIGN)) { canSign = data.getBoolean(SAVE_KEYRING_CAN_SIGN); } - if (newPassPhrase == null) { - newPassPhrase = oldPassPhrase; + if (newPassphrase == null) { + newPassphrase = oldPassphrase; } long masterKeyId = saveParams.keys.get(0).getKeyID(); @@ -508,7 +508,7 @@ public class KeychainIntentService extends IntentService PGPSecretKeyRing keyRing = ProviderHelper .getPGPSecretKeyRingByKeyId(this, masterKeyId); keyRing = keyOperations.changeSecretKeyPassphrase(keyRing, - oldPassPhrase, newPassPhrase); + oldPassphrase, newPassphrase); setProgress(R.string.progress_saving_key_ring, 50, 100); ProviderHelper.saveKeyRing(this, keyRing); setProgress(R.string.progress_done, 100, 100); @@ -526,7 +526,7 @@ public class KeychainIntentService extends IntentService ProviderHelper.saveKeyRing(this, pair.second); setProgress(R.string.progress_done, 100, 100); } - PassphraseCacheService.addCachedPassphrase(this, masterKeyId, newPassPhrase); + PassphraseCacheService.addCachedPassphrase(this, masterKeyId, newPassphrase); /* Output */ sendMessageToHandler(KeychainIntentServiceHandler.MESSAGE_OKAY); @@ -816,9 +816,9 @@ public class KeychainIntentService extends IntentService ArrayList<String> userIds = data.getStringArrayList(CERTIFY_KEY_UIDS); /* Operation */ - String signaturePassPhrase = PassphraseCacheService.getCachedPassphrase(this, + String signaturePassphrase = PassphraseCacheService.getCachedPassphrase(this, masterKeyId); - if (signaturePassPhrase == null) { + if (signaturePassphrase == null) { throw new PgpGeneralException("Unable to obtain passphrase"); } @@ -829,7 +829,7 @@ public class KeychainIntentService extends IntentService PGPSecretKey certificationKey = PgpKeyHelper.getCertificationKey(this, masterKeyId); publicKey = keyOperation.certifyKey(certificationKey, publicKey, - userIds, signaturePassPhrase); + userIds, signaturePassphrase); publicRing = PGPPublicKeyRing.insertPublicKey(publicRing, publicKey); // store the signed key in our local cache |