aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java7
m---------extern/openpgp-api-lib0
2 files changed, 6 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
index 365401584..da419b241 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
@@ -226,6 +226,10 @@ public class OpenPgpService extends RemoteService {
boolean sign) {
try {
boolean asciiArmor = data.getBooleanExtra(OpenPgpApi.EXTRA_REQUEST_ASCII_ARMOR, true);
+ String originalFilename = data.getStringExtra(OpenPgpApi.EXTRA_ORIGINAL_FILENAME);
+ if (originalFilename == null) {
+ originalFilename = "";
+ }
long[] keyIds;
if (data.hasExtra(OpenPgpApi.EXTRA_KEY_IDS)) {
@@ -271,7 +275,8 @@ public class OpenPgpService extends RemoteService {
builder.setEnableAsciiArmorOutput(asciiArmor)
.setCompressionId(accSettings.getCompression())
.setSymmetricEncryptionAlgorithm(accSettings.getEncryptionAlgorithm())
- .setEncryptionMasterKeyIds(keyIds);
+ .setEncryptionMasterKeyIds(keyIds)
+ .setOriginalFilename(originalFilename);
if (sign) {
String passphrase;
diff --git a/extern/openpgp-api-lib b/extern/openpgp-api-lib
-Subproject 777d22d75da9bfecf0bcfe2088da3fef01b2259
+Subproject 940a1d8eebe297e6a94f417a24c0403f1d8d650