diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-06-18 03:10:59 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-06-18 03:10:59 +0200 |
| commit | c11fef6e7c80681ce69e5fdc7f4796b0b7a18e2b (patch) | |
| tree | 08f7b132039671fcf8e5d76655181d8a3d3023fb /OpenKeychain/src/main/AndroidManifest.xml | |
| parent | f978aca8e587e4b9cd0574cac6f4bc7cc3d9fef9 (diff) | |
| download | open-keychain-c11fef6e7c80681ce69e5fdc7f4796b0b7a18e2b.tar.gz open-keychain-c11fef6e7c80681ce69e5fdc7f4796b0b7a18e2b.tar.bz2 open-keychain-c11fef6e7c80681ce69e5fdc7f4796b0b7a18e2b.zip | |
handle multiple input URIs and Intent.SEND_MULTIPLE
Diffstat (limited to 'OpenKeychain/src/main/AndroidManifest.xml')
| -rw-r--r-- | OpenKeychain/src/main/AndroidManifest.xml | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/OpenKeychain/src/main/AndroidManifest.xml b/OpenKeychain/src/main/AndroidManifest.xml index 75d94ae69..19b775149 100644 --- a/OpenKeychain/src/main/AndroidManifest.xml +++ b/OpenKeychain/src/main/AndroidManifest.xml @@ -210,15 +210,6 @@ <category android:name="android.intent.category.DEFAULT" /> </intent-filter> - <!-- Android's Send Action --> - <intent-filter android:label="@string/intent_send_decrypt"> - <action android:name="android.intent.action.SEND" /> - - <category android:name="android.intent.category.DEFAULT" /> - - <data android:mimeType="text/*" /> - <data android:mimeType="message/*" /> - </intent-filter> </activity> <activity android:name=".ui.DecryptFilesActivity" @@ -266,13 +257,15 @@ <data android:scheme="file" /> <data android:scheme="content" /> </intent-filter> - <!-- Android's Send Action --> + <!-- Android's Send and Multi-Send Actions --> <intent-filter android:label="@string/intent_send_decrypt"> <action android:name="android.intent.action.SEND" /> + <action android:name="android.intent.action.SEND_MULTIPLE" /> <category android:name="android.intent.category.DEFAULT" /> - <!-- everything except text/* and message/* --> + <data android:mimeType="text/*" /> + <data android:mimeType="message/*" /> <data android:mimeType="image/*" /> <data android:mimeType="audio/*" /> <data android:mimeType="video/*" /> |