Skip to content

Commit 593aa0a

Browse files
authored
fix(android): better proxy mimeType detection for Capacitor injection (#1774)
1 parent 6eba0ea commit 593aa0a

File tree

1 file changed

+4
-7
lines changed

1 file changed

+4
-7
lines changed

android/capacitor/src/main/java/com/getcapacitor/WebViewLocalServer.java

+4-7
Original file line numberDiff line numberDiff line change
@@ -302,17 +302,14 @@ private WebResourceResponse handleProxyRequest(WebResourceRequest request, PathH
302302
conn.setReadTimeout(30 * 1000);
303303
conn.setConnectTimeout(30 * 1000);
304304

305-
InputStream responseStream = conn.getInputStream();
306-
String mimeType = getMimeType(path, responseStream);
307-
308-
if (mimeType.equals("text/html")) {
305+
if (conn.getContentType().contains("text/html")) {
306+
InputStream responseStream = conn.getInputStream();
309307
responseStream = jsInjector.getInjectedStream(responseStream);
310308
bridge.reset();
309+
return new WebResourceResponse("text/html", handler.getEncoding(),
310+
handler.getStatusCode(), handler.getReasonPhrase(), handler.getResponseHeaders(), responseStream);
311311
}
312312

313-
return new WebResourceResponse(mimeType, handler.getEncoding(),
314-
handler.getStatusCode(), handler.getReasonPhrase(), handler.getResponseHeaders(), responseStream);
315-
316313
} catch (SocketTimeoutException ex) {
317314
bridge.handleAppUrlLoadError(ex);
318315
} catch (Exception ex) {

0 commit comments

Comments
 (0)