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 | |
| 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
| -rw-r--r-- | OpenKeychain/src/main/AndroidManifest.xml | 6 | ||||
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/OpenKeychain/src/main/AndroidManifest.xml b/OpenKeychain/src/main/AndroidManifest.xml index 142690abb..a1ad7139d 100644 --- a/OpenKeychain/src/main/AndroidManifest.xml +++ b/OpenKeychain/src/main/AndroidManifest.xml @@ -176,7 +176,7 @@ android:label="@string/title_decrypt" android:windowSoftInputMode="stateHidden"> - <!-- VIEW with mimeType application/pgp-encrypted --> + <!-- VIEW with mimeType application/octet-stream, application/pgp and text/pgp --> <intent-filter android:label="@string/intent_send_decrypt"> <action android:name="android.intent.action.VIEW" /> @@ -184,7 +184,9 @@ <category android:name="android.intent.category.DEFAULT" /> <!-- mime type as defined in http://tools.ietf.org/html/rfc3156 --> - <data android:mimeType="application/pgp-encrypted" /> + <data android:mimeType="application/octet-stream" /> + <data android:mimeType="application/pgp" /> + <data android:mimeType="text/pgp" /> </intent-filter> <!-- Keychain's own Actions --> <!-- DECRYPT with text as extra --> 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>(); |