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

extract extension manually if getFileExtensionFromUrl failed

Browse Source 
This fixes issues with whitespace in filenames
This commit is contained in:
Vincent Breitmoser
2017-01-03 19:04:58 +01:00
parent a160c8fe7f
commit ac4bb3450f
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerifyOperation.java
View File

@@ -390,7 +390,10 @@ public class PgpDecryptVerifyOperation extends BaseOperation<PgpDecryptVerifyInp
} else { } else {
// 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 (TextUtils.isEmpty(extension) && originalFilename.contains(".")) {
extension = originalFilename.substring(originalFilename.lastIndexOf(".") +1);
}
if (!TextUtils.isEmpty(extension)) {
MimeTypeMap mime = MimeTypeMap.getSingleton(); MimeTypeMap mime = MimeTypeMap.getSingleton();
mimeType = mime.getMimeTypeFromExtension(extension); mimeType = mime.getMimeTypeFromExtension(extension);
} }