moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-11-27 11:12:15 -05:00
Code Issues Releases Wiki Activity

Implement EXTRA_ORIGINAL_FILENAME for API

Browse Source
This commit is contained in:
Dominik Schürmann 2014-08-11 23:57:11 +02:00
parent acf5b99434
commit ae5e75f4e1
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
View File

@ -226,6 +226,10 @@ public class OpenPgpService extends RemoteService {
boolean sign) { boolean sign) {
try { try {
boolean asciiArmor = data.getBooleanExtra(OpenPgpApi.EXTRA_REQUEST_ASCII_ARMOR, true); boolean asciiArmor = data.getBooleanExtra(OpenPgpApi.EXTRA_REQUEST_ASCII_ARMOR, true);
String originalFilename = data.getStringExtra(OpenPgpApi.EXTRA_ORIGINAL_FILENAME);
if (originalFilename == null) {
originalFilename = "";
}
long[] keyIds; long[] keyIds;
if (data.hasExtra(OpenPgpApi.EXTRA_KEY_IDS)) { if (data.hasExtra(OpenPgpApi.EXTRA_KEY_IDS)) {
@ -271,7 +275,8 @@ public class OpenPgpService extends RemoteService {
builder.setEnableAsciiArmorOutput(asciiArmor) builder.setEnableAsciiArmorOutput(asciiArmor)
.setCompressionId(accSettings.getCompression()) .setCompressionId(accSettings.getCompression())
.setSymmetricEncryptionAlgorithm(accSettings.getEncryptionAlgorithm()) .setSymmetricEncryptionAlgorithm(accSettings.getEncryptionAlgorithm())
.setEncryptionMasterKeyIds(keyIds); .setEncryptionMasterKeyIds(keyIds)
.setOriginalFilename(originalFilename);
if (sign) { if (sign) {
String passphrase; String passphrase;

2
extern/openpgp-api-lib vendored

@ -1 +1 @@
Subproject commit 777d22d75da9bfecf0bcfe2088da3fef01b2259f Subproject commit 940a1d8eebe297e6a94f417a24c0403f1d8d650f