moparisthebest
/
k-9
mirror of https://github.com/moparisthebest/k-9
1
0
Fork 0
Code Issues Releases Wiki Activity

Extract method

This commit is contained in:
cketti 2015-02-04 21:14:04 +01:00
parent 937ca7e17a
commit 36abde2c0b
1 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
k9mail/src/main/java/com/fsck/k9/ui/messageview/DownloadImageTask.java
View File

@ -97,19 +97,7 @@ class DownloadImageTask extends AsyncTask<String, Void, String> {
in = contentResolver.openInputStream(uri);
}
// Do we still need an extension?
if (filename.indexOf('.') == -1) {
// Use JPEG as fallback
String extension = "jpeg";
if (mimeType != null) {
// Try to find an extension for the given MIME type
String ext = MimeUtility.getExtensionByMimeType(mimeType);
if (ext != null) {
extension = ext;
}
}
filename += "." + extension;
}
filename = getFileNameWithExtension(filename, mimeType);
String sanitized = FileHelper.sanitizeFilename(filename);
@ -136,6 +124,23 @@ class DownloadImageTask extends AsyncTask<String, Void, String> {
}
}
private String getFileNameWithExtension(String filename, String mimeType) {
if (filename.indexOf('.') != -1) {
return filename;
}
// Use JPEG as fallback
String extension = "jpeg";
if (mimeType != null) {
String extensionFromMimeType = MimeUtility.getExtensionByMimeType(mimeType);
if (extensionFromMimeType != null) {
extension = extensionFromMimeType;
}
}
return filename + "." + extension;
}
@Override
protected void onPostExecute(String filename) {
String text;