aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2014-08-04 15:49:49 +0200
committerDominik Schürmann <dominik@dominikschuermann.de>2014-08-04 15:49:49 +0200
commit3a6ac2a16aef9a066bf196df04c40d03f348d147 (patch)
tree5c836a4ebe77a21d0f616446a3f25f787b61d297 /OpenKeychain
parente87c69647c06740146dcbdb9ee350aeacc178a94 (diff)
downloadopen-keychain-3a6ac2a16aef9a066bf196df04c40d03f348d147.tar.gz
open-keychain-3a6ac2a16aef9a066bf196df04c40d03f348d147.tar.bz2
open-keychain-3a6ac2a16aef9a066bf196df04c40d03f348d147.zip
More cleanup
Diffstat (limited to 'OpenKeychain')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java7
1 files changed, 4 insertions, 3 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java
index 0007d179a..94f828b48 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java
@@ -239,7 +239,7 @@ public class EncryptActivity extends DrawerActivity implements EncryptActivityIn
if (mShareAfterEncrypt) {
// Share encrypted message/file
- startActivity(sendWithChooserExcludingOpenKeychain(message));
+ startActivity(sendWithChooserExcludingEncrypt(message));
} else if (isContentMessage()) {
// Copy to clipboard
copyToClipboard(message);
@@ -308,17 +308,18 @@ public class EncryptActivity extends DrawerActivity implements EncryptActivityIn
* @param message
* @return
*/
- private Intent sendWithChooserExcludingOpenKeychain(Message message) {
+ private Intent sendWithChooserExcludingEncrypt(Message message) {
Intent prototype = createSendIntent(message);
String title = isContentMessage() ? getString(R.string.title_share_message)
: 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) {
return Intent.createChooser(prototype, title);
}
+ // prevent recursion aka Inception :P
String[] blacklist = new String[]{Constants.PACKAGE_NAME + ".ui.EncryptActivity"};
List<LabeledIntent> targetedShareIntents = new ArrayList<LabeledIntent>();