aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2015-09-29 20:26:37 +0200
committerVincent Breitmoser <valodim@mugenguild.com>2015-09-30 14:41:14 +0200
commit771d9d54b6625a3eaa7decc620c34dc35269de5f (patch)
tree213150b0bf330610bf4cd1a4a4d1ea13178231f4 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations
parentf461d6b1d83604d6752ac97128403ff2a34ddec4 (diff)
downloadopen-keychain-771d9d54b6625a3eaa7decc620c34dc35269de5f.tar.gz
open-keychain-771d9d54b6625a3eaa7decc620c34dc35269de5f.tar.bz2
open-keychain-771d9d54b6625a3eaa7decc620c34dc35269de5f.zip
inputdata: don't attempt mime decode on application/* except octet-stream
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/InputDataOperation.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/InputDataOperation.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/InputDataOperation.java
index 7ec33874f..c48ccc500 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/InputDataOperation.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/InputDataOperation.java
@@ -135,7 +135,7 @@ public class InputDataOperation extends BaseOperation<InputDataParcel> {
|| contentType != null
&& !contentType.startsWith("multipart/")
&& !contentType.startsWith("text/")
- && !contentType.startsWith("application/")) {
+ && !"application/octet-stream".equals(contentType)) {
skipMimeParsing = true;
}
}