Merge remote-tracking branch 'origin/master' into encrypted-export

2015-09-28 18:27:29 +02:00
parent b65a23f2d4 3df9bea455
commit 0e613aff2e
71 changed files with 2111 additions and 756 deletions
--- a/OpenKeychain/src/main/AndroidManifest.xml
+++ b/OpenKeychain/src/main/AndroidManifest.xml
@@ -263,9 +263,7 @@
                <action android:name="org.sufficientlysecure.keychain.action.DECRYPT_DATA" />

                <category android:name="android.intent.category.DEFAULT" />
-
-                <data android:scheme="file" />
-                <data android:scheme="content" />
+                <data android:mimeType="*/*" />
            </intent-filter>

            <!-- DECRYPT_TEXT -->