Merge branch 'master' of github.com:open-keychain/open-keychain

jkolo · Aug 20, 2014 · c00d619 · c00d619
2 parents d26c6b1 + c86ef06
commit c00d619
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/OpenKeychain/src/main/AndroidManifest.xml b/OpenKeychain/src/main/AndroidManifest.xml
@@ -176,15 +176,17 @@
             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" />
 
                 <category android:name="android.intent.category.BROWSABLE" />
                 <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
@@ -382,7 +382,7 @@ private Intent createSendIntent(Message message) {
                 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>();