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

More cleanup

Browse Source
This commit is contained in:
Dominik Schürmann 2014-08-04 15:49:49 +02:00
parent e87c69647c
commit 3a6ac2a16a
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java
View File

@ -239,7 +239,7 @@ public class EncryptActivity extends DrawerActivity implements EncryptActivityIn
if (mShareAfterEncrypt) { if (mShareAfterEncrypt) {
// Share encrypted message/file // Share encrypted message/file
startActivity(sendWithChooserExcludingOpenKeychain(message)); startActivity(sendWithChooserExcludingEncrypt(message));
} else if (isContentMessage()) { } else if (isContentMessage()) {
// Copy to clipboard // Copy to clipboard
copyToClipboard(message); copyToClipboard(message);
@ -308,17 +308,18 @@ public class EncryptActivity extends DrawerActivity implements EncryptActivityIn
* @param message * @param message
* @return * @return
*/ */
private Intent sendWithChooserExcludingOpenKeychain(Message message) { private Intent sendWithChooserExcludingEncrypt(Message message) {
Intent prototype = createSendIntent(message); Intent prototype = createSendIntent(message);
String title = isContentMessage() ? getString(R.string.title_share_message) String title = isContentMessage() ? getString(R.string.title_share_message)
: getString(R.string.title_share_file); : getString(R.string.title_share_file);
// somehow this returns lists with only one entry on Android 2.3 // fallback on Android 2.3, otherwise we would get weird results
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.ICE_CREAM_SANDWICH) { if (Build.VERSION.SDK_INT < Build.VERSION_CODES.ICE_CREAM_SANDWICH) {
return Intent.createChooser(prototype, title); return Intent.createChooser(prototype, title);
} }
// prevent recursion aka Inception :P
String[] blacklist = new String[]{Constants.PACKAGE_NAME + ".ui.EncryptActivity"}; String[] blacklist = new String[]{Constants.PACKAGE_NAME + ".ui.EncryptActivity"};
List<LabeledIntent> targetedShareIntents = new ArrayList<LabeledIntent>(); List<LabeledIntent> targetedShareIntents = new ArrayList<LabeledIntent>();