diff options
| author | mar-v-in <github@rvin.mooo.com> | 2014-08-19 18:54:48 +0200 |
|---|---|---|
| committer | mar-v-in <github@rvin.mooo.com> | 2014-08-19 18:54:48 +0200 |
| commit | 1a6734f29c0a07c58f356e3861530adfe63f684a (patch) | |
| tree | f379726d5466addcf9215197a8e263f45d1e7fb1 /OpenKeychain | |
| parent | 16ab7610061726110f917533348f4c37a0690321 (diff) | |
| download | open-keychain-1a6734f29c0a07c58f356e3861530adfe63f684a.tar.gz open-keychain-1a6734f29c0a07c58f356e3861530adfe63f684a.tar.bz2 open-keychain-1a6734f29c0a07c58f356e3861530adfe63f684a.zip | |
Fix mime types, #781
Diffstat (limited to 'OpenKeychain')
| -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>(); |