aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/AndroidManifest.xml
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2014-09-06 17:55:19 +0200
committerDominik Schürmann <dominik@dominikschuermann.de>2014-09-06 17:55:19 +0200
commitcc1411942519474a54b28cde87331ba602111edb (patch)
tree220fbc99d6e47144a9c97d8754626ab331e1b610 /OpenKeychain/src/main/AndroidManifest.xml
parentf2f1a9516d2c877eda994b3debdaa462319f4941 (diff)
downloadopen-keychain-cc1411942519474a54b28cde87331ba602111edb.tar.gz
open-keychain-cc1411942519474a54b28cde87331ba602111edb.tar.bz2
open-keychain-cc1411942519474a54b28cde87331ba602111edb.zip
Fix AndroidManifest for new encrypt activities
Diffstat (limited to 'OpenKeychain/src/main/AndroidManifest.xml')
-rw-r--r--OpenKeychain/src/main/AndroidManifest.xml26
1 files changed, 25 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/AndroidManifest.xml b/OpenKeychain/src/main/AndroidManifest.xml
index e644012eb..0406d8c66 100644
--- a/OpenKeychain/src/main/AndroidManifest.xml
+++ b/OpenKeychain/src/main/AndroidManifest.xml
@@ -154,6 +154,12 @@
<data android:scheme="file" />
<data android:scheme="content" />
+ <!-- everything except text/* and message/* -->
+ <data android:mimeType="image/*" />
+ <data android:mimeType="audio/*" />
+ <data android:mimeType="video/*" />
+ <data android:mimeType="application/*" />
+ <data android:mimeType="multipart/*" />
</intent-filter>
<!-- Android's Send Action -->
<intent-filter android:label="@string/intent_send_encrypt">
@@ -162,7 +168,12 @@
<category android:name="android.intent.category.DEFAULT" />
- <data android:mimeType="*/*" />
+ <!-- everything except text/* and message/* -->
+ <data android:mimeType="image/*" />
+ <data android:mimeType="audio/*" />
+ <data android:mimeType="video/*" />
+ <data android:mimeType="application/*" />
+ <data android:mimeType="multipart/*" />
</intent-filter>
</activity>
<activity
@@ -177,6 +188,19 @@
<action android:name="org.sufficientlysecure.keychain.action.ENCRYPT" />
<category android:name="android.intent.category.DEFAULT" />
+
+ <data android:mimeType="text/*" />
+ <data android:mimeType="message/*" />
+ </intent-filter>
+ <!-- Android's Send Action -->
+ <intent-filter android:label="@string/intent_send_encrypt">
+ <action android:name="android.intent.action.SEND" />
+ <action android:name="android.intent.action.SEND_MULTIPLE" />
+
+ <category android:name="android.intent.category.DEFAULT" />
+
+ <data android:mimeType="text/*" />
+ <data android:mimeType="message/*" />
</intent-filter>
</activity>
<activity