diff options
author | Thialfihar <thialfihar@gmail.com> | 2010-04-28 23:35:11 +0000 |
---|---|---|
committer | Thialfihar <thialfihar@gmail.com> | 2010-04-28 23:35:11 +0000 |
commit | e83a5311aed0671c044287ca571cb88fe2bcd522 (patch) | |
tree | 59dbbbfcfe79748783da8f6e39de6480d5657a22 /src/org/thialfihar/android/apg/EncryptMessageActivity.java | |
parent | 86192e39d90a329b327e6b9255b08a17ae5ede0b (diff) | |
download | open-keychain-e83a5311aed0671c044287ca571cb88fe2bcd522.tar.gz open-keychain-e83a5311aed0671c044287ca571cb88fe2bcd522.tar.bz2 open-keychain-e83a5311aed0671c044287ca571cb88fe2bcd522.zip |
add preferences, use them where applicable
Diffstat (limited to 'src/org/thialfihar/android/apg/EncryptMessageActivity.java')
-rw-r--r-- | src/org/thialfihar/android/apg/EncryptMessageActivity.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/org/thialfihar/android/apg/EncryptMessageActivity.java b/src/org/thialfihar/android/apg/EncryptMessageActivity.java index f03e6ea09..da49bf26b 100644 --- a/src/org/thialfihar/android/apg/EncryptMessageActivity.java +++ b/src/org/thialfihar/android/apg/EncryptMessageActivity.java @@ -25,7 +25,6 @@ import java.security.SignatureException; import java.util.Vector; import org.bouncycastle2.bcpg.HashAlgorithmTags; -import org.bouncycastle2.openpgp.PGPEncryptedData; import org.bouncycastle2.openpgp.PGPException; import org.bouncycastle2.openpgp.PGPPublicKey; import org.bouncycastle2.openpgp.PGPPublicKeyRing; @@ -202,10 +201,11 @@ public class EncryptMessageActivity extends BaseActivity { if (encryptIt) { Apg.encrypt(in, out, true, mEncryptionKeyIds, getSecretKeyId(), Apg.getPassPhrase(), this, - PGPEncryptedData.AES_256, null); + getDefaultEncryptionAlgorithm(), getDefaultHashAlgorithm(), + null); } else { Apg.signText(in, out, getSecretKeyId(), - Apg.getPassPhrase(), HashAlgorithmTags.SHA256, this); + Apg.getPassPhrase(), getDefaultHashAlgorithm(), this); } data.putString("message", new String(out.toByteArray())); } catch (IOException e) { |