aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2015-03-09 18:33:20 +0100
committerDominik Schürmann <dominik@dominikschuermann.de>2015-03-09 18:33:20 +0100
commit7c22fc843b7f00f63c0f85cbd3565700b5e73698 (patch)
treeb2e5822a38197704976d772f636e7ffa2156c293 /OpenKeychain
parent009e8e9e393ff2a1a435c44509538e2b75f45380 (diff)
downloadopen-keychain-7c22fc843b7f00f63c0f85cbd3565700b5e73698.tar.gz
open-keychain-7c22fc843b7f00f63c0f85cbd3565700b5e73698.tar.bz2
open-keychain-7c22fc843b7f00f63c0f85cbd3565700b5e73698.zip
Fix ascii armor in encrypt activity
Diffstat (limited to 'OpenKeychain')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFilesActivity.java5
1 files changed, 2 insertions, 3 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFilesActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFilesActivity.java
index 8ab5680d0..d95b5cda3 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFilesActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFilesActivity.java
@@ -209,6 +209,7 @@ public class EncryptFilesActivity extends EncryptActivity implements EncryptActi
} else {
data.setCompressionId(CompressionAlgorithmTags.UNCOMPRESSED);
}
+ data.setEnableAsciiArmorOutput(mUseArmor);
data.setSymmetricEncryptionAlgorithm(PgpConstants.OpenKeychainSymmetricKeyAlgorithmTags.USE_PREFERRED);
data.setSignatureHashAlgorithm(PgpConstants.OpenKeychainSymmetricKeyAlgorithmTags.USE_PREFERRED);
@@ -409,9 +410,7 @@ public class EncryptFilesActivity extends EncryptActivity implements EncryptActi
uris = intent.getParcelableArrayListExtra(Intent.EXTRA_STREAM);
}
- if (extras.containsKey(EXTRA_ASCII_ARMOR)) {
- mUseArmor = extras.getBoolean(EXTRA_ASCII_ARMOR, true);
- }
+ mUseArmor = extras.getBoolean(EXTRA_ASCII_ARMOR, false);
// preselect keys given by intent
mSigningKeyId = extras.getLong(EXTRA_SIGNATURE_KEY_ID);