aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2013-08-09 06:09:23 -0700
committerDominik Schürmann <dominik@dominikschuermann.de>2013-08-09 06:09:23 -0700
commitc6743acfce3180c6396b9d25344ce22709407ecf (patch)
treef60edd91e37afdfa0be63d9123de55a051d7379f
parentd1c1c45421e1297b159f37f9aeae4450824c3102 (diff)
parent8becbd0622eb0cf5021985940adb3ddd06933a56 (diff)
downloadopen-keychain-c6743acfce3180c6396b9d25344ce22709407ecf.tar.gz
open-keychain-c6743acfce3180c6396b9d25344ce22709407ecf.tar.bz2
open-keychain-c6743acfce3180c6396b9d25344ce22709407ecf.zip
Merge pull request #68 from m0rph3us1987/master
Pass encrypted messages to different messaging services
-rw-r--r--OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/EncryptActivity.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/EncryptActivity.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/EncryptActivity.java
index 25901d855..e38044526 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/EncryptActivity.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/EncryptActivity.java
@@ -778,7 +778,11 @@ public class EncryptActivity extends SherlockFragmentActivity {
Log.d(Constants.TAG, "output: " + output);
Intent emailIntent = new Intent(Intent.ACTION_SEND);
- emailIntent.setType("text/plain; charset=utf-8");
+
+ //Type is set to text/plain so that encrypted messages can
+ //be sent with Whatsapp, Hangouts, SMS etc...
+ emailIntent.setType("text/plain");
+
emailIntent.putExtra(Intent.EXTRA_TEXT, output);
if (mSubject != null) {
emailIntent.putExtra(Intent.EXTRA_SUBJECT, mSubject);