moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-12-25 08:28:50 -05:00
Code Issues Releases Wiki Activity

Fix AndroidManifest for new encrypt activities

Browse Source
This commit is contained in:
Dominik Schürmann 2014-09-06 17:55:19 +02:00
parent f2f1a9516d
commit cc14119425
3 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
OpenKeychain/src/main/AndroidManifest.xml
View File

@ -154,6 +154,12 @@
<data android:scheme="file" /> <data android:scheme="file" />
<data android:scheme="content" /> <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> </intent-filter>
<!-- Android's Send Action --> <!-- Android's Send Action -->
<intent-filter android:label="@string/intent_send_encrypt"> <intent-filter android:label="@string/intent_send_encrypt">
@ -162,7 +168,12 @@
<category android:name="android.intent.category.DEFAULT" /> <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> </intent-filter>
</activity> </activity>
<activity <activity
@ -177,6 +188,19 @@
<action android:name="org.sufficientlysecure.keychain.action.ENCRYPT" /> <action android:name="org.sufficientlysecure.keychain.action.ENCRYPT" />
<category android:name="android.intent.category.DEFAULT" /> <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> </intent-filter>
</activity> </activity>
<activity <activity

2
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileActivity.java
View File

@ -267,7 +267,7 @@ public class EncryptFileActivity extends DrawerActivity implements EncryptActivi
private Intent sendWithChooserExcludingEncrypt(Message message) { private Intent sendWithChooserExcludingEncrypt(Message message) {
Intent prototype = createSendIntent(message); Intent prototype = createSendIntent(message);
String title = getString(R.string.title_share_file); 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); return new ShareHelper(this).createChooserExcluding(prototype, title, blacklist);
} }

2
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptTextActivity.java
View File

@ -250,7 +250,7 @@ public class EncryptTextActivity extends DrawerActivity implements EncryptActivi
private Intent sendWithChooserExcludingEncrypt(Message message) { private Intent sendWithChooserExcludingEncrypt(Message message) {
Intent prototype = createSendIntent(message); Intent prototype = createSendIntent(message);
String title = getString(R.string.title_share_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); return new ShareHelper(this).createChooserExcluding(prototype, title, blacklist);
} }