diff options
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFilesActivity.java | 5 | 
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);  | 
