diff options
-rw-r--r-- | core/java/android/webkit/BrowserFrame.java | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/core/java/android/webkit/BrowserFrame.java b/core/java/android/webkit/BrowserFrame.java index d3c0ffd..61a30ab 100644 --- a/core/java/android/webkit/BrowserFrame.java +++ b/core/java/android/webkit/BrowserFrame.java @@ -1075,6 +1075,18 @@ class BrowserFrame extends Handler { */ private void downloadStart(String url, String userAgent, String contentDisposition, String mimeType, long contentLength) { + // This will only work if the url ends with the filename + if (mimeType.isEmpty()) { + try { + String extension = url.substring(url.lastIndexOf('.') + 1); + mimeType = libcore.net.MimeUtils.guessMimeTypeFromExtension(extension); + // MimeUtils might return null, not sure if downloadmanager is happy with that + if (mimeType == null) + mimeType = ""; + } catch(IndexOutOfBoundsException exception) { + // mimeType string end with a '.', not much to do + } + } mimeType = MimeTypeMap.getSingleton().remapGenericMimeType( mimeType, url, contentDisposition); mCallbackProxy.onDownloadStart(url, userAgent, |