From c11fef6e7c80681ce69e5fdc7f4796b0b7a18e2b Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Thu, 18 Jun 2015 03:10:59 +0200
Subject: handle multiple input URIs and Intent.SEND_MULTIPLE

---
 OpenKeychain/src/main/AndroidManifest.xml | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

(limited to 'OpenKeychain/src/main/AndroidManifest.xml')

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/*" />
-- 
cgit v1.2.3