aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2015-06-29 07:54:58 +0200
committerDominik Schürmann <dominik@dominikschuermann.de>2015-06-29 07:54:58 +0200
commit4667a05c420b72a8d3c509a9e3c1cb8ab0ff92cc (patch)
treea5bb03f0fcdfb33dd23c938a7ebb4c0bd32ba481 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java
parent41508075593613fbceac1c1ecd16a10ccfe55112 (diff)
downloadopen-keychain-4667a05c420b72a8d3c509a9e3c1cb8ab0ff92cc.tar.gz
open-keychain-4667a05c420b72a8d3c509a9e3c1cb8ab0ff92cc.tar.bz2
open-keychain-4667a05c420b72a8d3c509a9e3c1cb8ab0ff92cc.zip
Guess mime type like support libs FileProvider
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java8
1 files changed, 1 insertions, 7 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java
index 6a85ce251..7a4c85178 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java
@@ -70,7 +70,6 @@ import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
-import java.net.URLConnection;
import java.security.SignatureException;
import java.util.Date;
import java.util.Iterator;
@@ -676,8 +675,6 @@ public class PgpDecryptVerify extends BaseOperation<PgpDecryptVerifyInputParcel>
|| literalData.getFormat() == PGPLiteralData.UTF8) {
mimeType = "text/plain";
} else {
- // TODO: better would be: https://github.com/open-keychain/open-keychain/issues/753
-
// try to guess from file ending
String extension = MimeTypeMap.getFileExtensionFromUrl(originalFilename);
if (extension != null) {
@@ -685,10 +682,7 @@ public class PgpDecryptVerify extends BaseOperation<PgpDecryptVerifyInputParcel>
mimeType = mime.getMimeTypeFromExtension(extension);
}
if (mimeType == null) {
- mimeType = URLConnection.guessContentTypeFromName(originalFilename);
- }
- if (mimeType == null) {
- mimeType = "*/*";
+ mimeType = "application/octet-stream";
}
}