diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-09-06 18:05:06 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-09-06 18:05:06 +0200 |
| commit | 05a29a1f8f20884dbd34fc8981aaba6d61ceb4cc (patch) | |
| tree | 397ee922e54d2794e0c7190b13880a75405f0805 /OpenKeychain | |
| parent | cc1411942519474a54b28cde87331ba602111edb (diff) | |
| download | open-keychain-05a29a1f8f20884dbd34fc8981aaba6d61ceb4cc.tar.gz open-keychain-05a29a1f8f20884dbd34fc8981aaba6d61ceb4cc.tar.bz2 open-keychain-05a29a1f8f20884dbd34fc8981aaba6d61ceb4cc.zip | |
No inception with APG
Diffstat (limited to 'OpenKeychain')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileActivity.java | 7 | ||||
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptTextActivity.java | 7 |
2 files changed, 12 insertions, 2 deletions
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); } |