aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptTextActivity.java
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2014-09-06 18:05:06 +0200
committerDominik Schürmann <dominik@dominikschuermann.de>2014-09-06 18:05:06 +0200
commit05a29a1f8f20884dbd34fc8981aaba6d61ceb4cc (patch)
tree397ee922e54d2794e0c7190b13880a75405f0805 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptTextActivity.java
parentcc1411942519474a54b28cde87331ba602111edb (diff)
downloadopen-keychain-05a29a1f8f20884dbd34fc8981aaba6d61ceb4cc.tar.gz
open-keychain-05a29a1f8f20884dbd34fc8981aaba6d61ceb4cc.tar.bz2
open-keychain-05a29a1f8f20884dbd34fc8981aaba6d61ceb4cc.zip
No inception with APG
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptTextActivity.java')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptTextActivity.java7
1 files changed, 6 insertions, 1 deletions
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 1014b4b74..f008e26d5 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,12 @@ 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.EncryptTextActivity"};
+
+ // we don't want to encrypt the encrypted, no inception ;)
+ String[] blacklist = new String[]{
+ Constants.PACKAGE_NAME + ".ui.EncryptTextActivity",
+ "org.thialfihar.android.apg.ui.EncryptActivity"
+ };
return new ShareHelper(this).createChooserExcluding(prototype, title, blacklist);
}