cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

No inception with APG

Browse Source
This commit is contained in:
Dominik Schürmann
2014-09-06 18:05:06 +02:00
parent cc14119425
commit 05a29a1f8f
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -267,7 +267,12 @@ public class EncryptFileActivity extends DrawerActivity implements EncryptActivi
private Intent sendWithChooserExcludingEncrypt(Message message) { private Intent sendWithChooserExcludingEncrypt(Message message) {
Intent prototype = createSendIntent(message); Intent prototype = createSendIntent(message);
String title = getString(R.string.title_share_file); 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); return new ShareHelper(this).createChooserExcluding(prototype, title, blacklist);
} }

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

@@ -250,7 +250,12 @@ public class EncryptTextActivity extends DrawerActivity implements EncryptActivi
private Intent sendWithChooserExcludingEncrypt(Message message) { private Intent sendWithChooserExcludingEncrypt(Message message) {
Intent prototype = createSendIntent(message); Intent prototype = createSendIntent(message);
String title = getString(R.string.title_share_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); return new ShareHelper(this).createChooserExcluding(prototype, title, blacklist);
} }