diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-08-20 09:20:55 +0200 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-08-20 09:20:55 +0200 |
commit | c00d619099eea678c423bca0c92feb29dcd78e32 (patch) | |
tree | 40473c7d69a0077771ddc90774c8a857781e9408 /OpenKeychain/src/main/java/org | |
parent | d26c6b1a08448c6fa884b8b7591d625006d1ac3b (diff) | |
parent | c86ef06a240c5364bc2fd8c0f6e094c7f2668a19 (diff) | |
download | open-keychain-c00d619099eea678c423bca0c92feb29dcd78e32.tar.gz open-keychain-c00d619099eea678c423bca0c92feb29dcd78e32.tar.bz2 open-keychain-c00d619099eea678c423bca0c92feb29dcd78e32.zip |
Merge branch 'master' of github.com:open-keychain/open-keychain
Diffstat (limited to 'OpenKeychain/src/main/java/org')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java index 59a433af3..d33e5116c 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java @@ -382,7 +382,7 @@ public class EncryptActivity extends DrawerActivity implements EncryptActivityIn sendIntent = new Intent(Intent.ACTION_SEND_MULTIPLE); sendIntent.putExtra(Intent.EXTRA_STREAM, mOutputUris); } - sendIntent.setType("application/pgp-encrypted"); + sendIntent.setType("application/octet-stream"); } if (!isModeSymmetric() && mEncryptionUserIds != null) { Set<String> users = new HashSet<String>(); |