From b25c2bb4dd56fb67379209d752e46e02cc64eb13 Mon Sep 17 00:00:00 2001 From: Josh Guilfoyle Date: Fri, 20 Feb 2015 16:15:49 -0800 Subject: [PATCH] Avoid sending a null `type` or `mimeType` in network responses DevTools refuses to show any entry that lacks the `type` property in recent versions. This makes it possible to inspect network responses that for whatever reason don't have the `Content-Type` header available. Closes #57 --- .../inspector/network/NetworkEventReporterImpl.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/stetho/src/main/java/com/facebook/stetho/inspector/network/NetworkEventReporterImpl.java b/stetho/src/main/java/com/facebook/stetho/inspector/network/NetworkEventReporterImpl.java index 9b830768..c6624879 100644 --- a/stetho/src/main/java/com/facebook/stetho/inspector/network/NetworkEventReporterImpl.java +++ b/stetho/src/main/java/com/facebook/stetho/inspector/network/NetworkEventReporterImpl.java @@ -130,9 +130,9 @@ public void responseHeadersReceived(InspectorResponse response) { responseJSON.statusText = response.reasonPhrase(); responseJSON.headers = formatHeadersAsJSON(response); String contentType = getContentType(response); - if (contentType != null) { - responseJSON.mimeType = getResourceTypeHelper().stripContentExtras(contentType); - } + responseJSON.mimeType = contentType != null ? + getResourceTypeHelper().stripContentExtras(contentType) : + "application/octet-stream"; responseJSON.connectionReused = response.connectionReused(); responseJSON.connectionId = response.connectionId(); responseJSON.fromDiskCache = response.fromDiskCache(); @@ -141,9 +141,9 @@ public void responseHeadersReceived(InspectorResponse response) { receivedParams.frameId = "1"; receivedParams.loaderId = "1"; receivedParams.timestamp = stethoNow() / 1000.0; - if (contentType != null) { - receivedParams.type = getResourceTypeHelper().determineResourceType(contentType); - } + receivedParams.type = contentType != null ? + getResourceTypeHelper().determineResourceType(contentType) : + Page.ResourceType.OTHER; receivedParams.response = responseJSON; peerManager.sendNotificationToPeers("Network.responseReceived", receivedParams); }