mirror of
https://github.com/moparisthebest/open-keychain
synced 2024-12-25 00:18:51 -05:00
Fix AndroidManifest for new encrypt activities
This commit is contained in:
parent
f2f1a9516d
commit
cc14119425
@ -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
|
||||
|
@ -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);
|
||||
}
|
||||
|
@ -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);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user