android/okhttp
1
0
Fork 0
mirror of https://github.com/square/okhttp.git synced 2025-11-26 06:43:09 +03:00
Code Releases Activity

Handle UnsupportedCharsetException in HttpLoggingInterceptor

Browse Source
This commit is contained in:
Dave Roberge
2016-01-16 15:32:09 -05:00
parent c193481e6d
commit fc238a225d
2 changed files with 50 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
okhttp-logging-interceptor/src/main/java/okhttp3/logging/HttpLoggingInterceptor.java
View File

@@ -17,6 +17,7 @@ package okhttp3.logging;
import java.io.IOException; import java.io.IOException;
import java.nio.charset.Charset; import java.nio.charset.Charset;
import java.nio.charset.UnsupportedCharsetException;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import okhttp3.Connection; import okhttp3.Connection;
import okhttp3.Headers; import okhttp3.Headers;
@@ -227,7 +228,15 @@ public final class HttpLoggingInterceptor implements Interceptor {
Charset charset = UTF8; Charset charset = UTF8;
MediaType contentType = responseBody.contentType(); MediaType contentType = responseBody.contentType();
if (contentType != null) { if (contentType != null) {
charset = contentType.charset(UTF8); try {
charset = contentType.charset(UTF8);
} catch (UnsupportedCharsetException e) {
logger.log("");
logger.log("Couldn't decode the response body; charset is likely malformed.");
logger.log("<-- END HTTP");
return response;
}
} }
if (contentLength != 0) { if (contentLength != 0) {

40
okhttp-logging-interceptor/src/test/java/okhttp3/logging/HttpLoggingInterceptorTest.java
View File

@@ -598,6 +598,46 @@ public final class HttpLoggingInterceptorTest {
.assertNoMoreLogs(); .assertNoMoreLogs();
} }
@Test public void bodyGetMalformedCharset() throws IOException {
setLevel(Level.BODY);
server.enqueue(new MockResponse()
.setHeader("Content-Type", "text/html; charset=0")
.setBody("Ignore This"));
Response response = client.newCall(request().build()).execute();
response.body().close();
networkLogs
.assertLogEqual("--> GET " + url + " http/1.1")
.assertLogEqual("Host: " + host)
.assertLogEqual("Connection: Keep-Alive")
.assertLogEqual("Accept-Encoding: gzip")
.assertLogMatch("User-Agent: okhttp/.+")
.assertLogEqual("--> END GET")
.assertLogMatch("<-- 200 OK " + url + " \\(\\d+ms\\)")
.assertLogEqual("Content-Type: text/html; charset=0")
.assertLogMatch("Content-Length: \\d+")
.assertLogMatch("OkHttp-Sent-Millis: \\d+")
.assertLogMatch("OkHttp-Received-Millis: \\d+")
.assertLogMatch("")
.assertLogEqual("Couldn't decode the response body; charset is likely malformed.")
.assertLogEqual("<-- END HTTP")
.assertNoMoreLogs();
applicationLogs
.assertLogEqual("--> GET " + url + " http/1.1")
.assertLogEqual("--> END GET")
.assertLogMatch("<-- 200 OK " + url + " \\(\\d+ms\\)")
.assertLogEqual("Content-Type: text/html; charset=0")
.assertLogMatch("Content-Length: \\d+")
.assertLogMatch("OkHttp-Sent-Millis: \\d+")
.assertLogMatch("OkHttp-Received-Millis: \\d+")
.assertLogEqual("")
.assertLogEqual("Couldn't decode the response body; charset is likely malformed.")
.assertLogEqual("<-- END HTTP")
.assertNoMoreLogs();
}
private Request.Builder request() { private Request.Builder request() {
return new Request.Builder().url(url); return new Request.Builder().url(url);
} }