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

Guess mime type like support libs FileProvider

Browse Source
This commit is contained in:
Dominik Schürmann
2015-06-29 07:54:58 +02:00
parent 4150807559
commit 4667a05c42
1 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java
View File

@@ -70,7 +70,6 @@ import java.io.FileNotFoundException;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.OutputStream; import java.io.OutputStream;
import java.net.URLConnection;
import java.security.SignatureException; import java.security.SignatureException;
import java.util.Date; import java.util.Date;
import java.util.Iterator; import java.util.Iterator;
@@ -676,8 +675,6 @@ public class PgpDecryptVerify extends BaseOperation<PgpDecryptVerifyInputParcel>
|| literalData.getFormat() == PGPLiteralData.UTF8) { || literalData.getFormat() == PGPLiteralData.UTF8) {
mimeType = "text/plain"; mimeType = "text/plain";
} else { } else {
// TODO: better would be: https://github.com/open-keychain/open-keychain/issues/753
// try to guess from file ending // try to guess from file ending
String extension = MimeTypeMap.getFileExtensionFromUrl(originalFilename); String extension = MimeTypeMap.getFileExtensionFromUrl(originalFilename);
if (extension != null) { if (extension != null) {
@@ -685,10 +682,7 @@ public class PgpDecryptVerify extends BaseOperation<PgpDecryptVerifyInputParcel>
mimeType = mime.getMimeTypeFromExtension(extension); mimeType = mime.getMimeTypeFromExtension(extension);
} }
if (mimeType == null) { if (mimeType == null) {
mimeType = URLConnection.guessContentTypeFromName(originalFilename); mimeType = "application/octet-stream";
}
if (mimeType == null) {
mimeType = "*/*";
} }
} }