From 05a29a1f8f20884dbd34fc8981aaba6d61ceb4cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Sat, 6 Sep 2014 18:05:06 +0200 Subject: No inception with APG --- .../org/sufficientlysecure/keychain/ui/EncryptFileActivity.java | 7 ++++++- .../org/sufficientlysecure/keychain/ui/EncryptTextActivity.java | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui') diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileActivity.java index 22c77c320..68a8fce93 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileActivity.java @@ -267,7 +267,12 @@ 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.EncryptFileActivity"}; + + // we don't want to encrypt the encrypted, no inception ;) + String[] blacklist = new String[]{ + Constants.PACKAGE_NAME + ".ui.EncryptFileActivity", + "org.thialfihar.android.apg.ui.EncryptActivity" + }; return new ShareHelper(this).createChooserExcluding(prototype, title, blacklist); } 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); } -- cgit v1.2.3