diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-09-06 17:55:19 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-09-06 17:55:19 +0200 |
| commit | cc1411942519474a54b28cde87331ba602111edb (patch) | |
| tree | 220fbc99d6e47144a9c97d8754626ab331e1b610 | |
| parent | f2f1a9516d2c877eda994b3debdaa462319f4941 (diff) | |
| download | open-keychain-cc1411942519474a54b28cde87331ba602111edb.tar.gz open-keychain-cc1411942519474a54b28cde87331ba602111edb.tar.bz2 open-keychain-cc1411942519474a54b28cde87331ba602111edb.zip | |
Fix AndroidManifest for new encrypt activities
3 files changed, 27 insertions, 3 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 diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileActivity.java index 0f4503652..22c77c320 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileActivity.java @@ -267,7 +267,7 @@ public class EncryptFileActivity extends DrawerActivity implements EncryptActivi private Intent sendWithChooserExcludingEncrypt(Message message) { Intent prototype = createSendIntent(message); String title = getString(R.string.title_share_file); - String[] blacklist = new String[]{Constants.PACKAGE_NAME + ".ui.EncryptActivity"}; + String[] blacklist = new String[]{Constants.PACKAGE_NAME + ".ui.EncryptFileActivity"}; return new ShareHelper(this).createChooserExcluding(prototype, title, blacklist); } diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptTextActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptTextActivity.java index 5386178f0..1014b4b74 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptTextActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptTextActivity.java @@ -250,7 +250,7 @@ public class EncryptTextActivity extends DrawerActivity implements EncryptActivi private Intent sendWithChooserExcludingEncrypt(Message message) { Intent prototype = createSendIntent(message); String title = getString(R.string.title_share_message); - String[] blacklist = new String[]{Constants.PACKAGE_NAME + ".ui.EncryptActivity"}; + String[] blacklist = new String[]{Constants.PACKAGE_NAME + ".ui.EncryptTextActivity"}; return new ShareHelper(this).createChooserExcluding(prototype, title, blacklist); } |