diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-04-01 14:10:32 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-04-01 14:10:32 +0200 |
| commit | c859bbb6da295afe16bf02e0d8d73f36e99c546a (patch) | |
| tree | 6d07b6f21639f93e0fb84dd770166ead39b92858 /OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java | |
| parent | b020f950e149368bd1d6413b2644b4c0e6f4bf31 (diff) | |
| download | open-keychain-c859bbb6da295afe16bf02e0d8d73f36e99c546a.tar.gz open-keychain-c859bbb6da295afe16bf02e0d8d73f36e99c546a.tar.bz2 open-keychain-c859bbb6da295afe16bf02e0d8d73f36e99c546a.zip | |
Fix symmetric encryption and cleanup
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 | 6 |
1 files changed, 3 insertions, 3 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 f616f7300..46033d094 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 @@ -43,7 +43,6 @@ import org.sufficientlysecure.keychain.util.*; import java.io.*; import java.util.ArrayList; -import java.util.GregorianCalendar; import java.util.List; /** @@ -99,6 +98,7 @@ public class KeychainIntentService extends IntentService public static final String ENCRYPT_INPUT_FILE = "input_file"; public static final String ENCRYPT_OUTPUT_FILE = "output_file"; public static final String ENCRYPT_PROVIDER_URI = "provider_uri"; + public static final String ENCRYPT_SYMMETRIC_PASSPHRASE = "passphrase"; // decrypt/verify public static final String DECRYPT_CIPHERTEXT_BYTES = "ciphertext_bytes"; @@ -221,7 +221,7 @@ public class KeychainIntentService extends IntentService int target = data.getInt(TARGET); long secretKeyId = data.getLong(ENCRYPT_SECRET_KEY_ID); - String encryptionPassphrase = data.getString(GENERATE_KEY_SYMMETRIC_PASSPHRASE); + String symmetricPassphrase = data.getString(ENCRYPT_SYMMETRIC_PASSPHRASE); boolean useAsciiArmor = data.getBoolean(ENCRYPT_USE_ASCII_ARMOR); long encryptionKeyIds[] = data.getLongArray(ENCRYPT_ENCRYPTION_KEYS_IDS); @@ -329,7 +329,7 @@ public class KeychainIntentService extends IntentService Preferences.getPreferences(this).getDefaultEncryptionAlgorithm()) .signatureForceV3(Preferences.getPreferences(this).getForceV3Signatures()) .encryptionKeyIds(encryptionKeyIds) - .encryptionPassphrase(encryptionPassphrase) + .symmetricPassphrase(symmetricPassphrase) .signatureKeyId(secretKeyId) .signatureHashAlgorithm( Preferences.getPreferences(this).getDefaultHashAlgorithm()) |