From fab472859dad60a65a3fb0e8c10c84e0e3255550 Mon Sep 17 00:00:00 2001 From: Simon Pireyn Date: Thu, 9 Jul 2015 20:00:10 +0200 Subject: [PATCH] CB-9343 Split the Content-Type to obtain a clean mimetype This closes #197 --- framework/src/org/apache/cordova/CordovaResourceApi.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/framework/src/org/apache/cordova/CordovaResourceApi.java b/framework/src/org/apache/cordova/CordovaResourceApi.java index 0390bb09..e725e255 100644 --- a/framework/src/org/apache/cordova/CordovaResourceApi.java +++ b/framework/src/org/apache/cordova/CordovaResourceApi.java @@ -188,7 +188,11 @@ public class CordovaResourceApi { HttpURLConnection conn = (HttpURLConnection)new URL(uri.toString()).openConnection(); conn.setDoInput(false); conn.setRequestMethod("HEAD"); - return conn.getHeaderField("Content-Type"); + String mimeType = conn.getHeaderField("Content-Type"); + if (mimeType != null) { + mimeType = mimeType.split(";")[0]; + } + return mimeType; } catch (IOException e) { } } @@ -283,6 +287,9 @@ public class CordovaResourceApi { HttpURLConnection conn = (HttpURLConnection)new URL(uri.toString()).openConnection(); conn.setDoInput(true); String mimeType = conn.getHeaderField("Content-Type"); + if (mimeType != null) { + mimeType = mimeType.split(";")[0]; + } int length = conn.getContentLength(); InputStream inputStream = conn.getInputStream(); return new OpenForReadResult(uri, inputStream, mimeType, length, null);