mirrors/public-transport-enabler
1
0
Fork 0
mirror of https://gitlab.com/oeffi/public-transport-enabler.git synced 2025-07-08 00:08:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

HttpClient: Read the content encoding from pragma for XML content if the encoding is missing from the Content-Type header.

Browse source
This commit is contained in:
Andreas Schildbach 2018-12-18 20:22:56 +01:00
parent 6e58ba6ebb
commit 805eec1dc7
1 changed files with 32 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

32
enabler/src/de/schildbach/pte/util/HttpClient.java
View file

@ -54,11 +54,13 @@ import okhttp3.CertificatePinner;
import okhttp3.Cookie; import okhttp3.Cookie;
import okhttp3.Headers; import okhttp3.Headers;
import okhttp3.HttpUrl; import okhttp3.HttpUrl;
import okhttp3.Interceptor;
import okhttp3.MediaType; import okhttp3.MediaType;
import okhttp3.OkHttpClient; import okhttp3.OkHttpClient;
import okhttp3.Request; import okhttp3.Request;
import okhttp3.RequestBody; import okhttp3.RequestBody;
import okhttp3.Response; import okhttp3.Response;
import okhttp3.Response.Builder;
import okhttp3.ResponseBody; import okhttp3.ResponseBody;
import okhttp3.logging.HttpLoggingInterceptor; import okhttp3.logging.HttpLoggingInterceptor;
@ -91,6 +93,35 @@ public final class HttpClient {
}); });
loggingInterceptor.setLevel(HttpLoggingInterceptor.Level.BASIC); loggingInterceptor.setLevel(HttpLoggingInterceptor.Level.BASIC);
final Interceptor xmlEncodingInterceptor = new Interceptor() {
private final Pattern P_XML_PRAGMA = Pattern.compile("<\\?xml.*?encoding=\"(.*?)\".*?\\?>");
private final String HEADER_CONTENT_TYPE = "Content-Type";
@Override
public Response intercept(final Interceptor.Chain chain) throws IOException {
Response response = chain.proceed(chain.request());
final MediaType originalContentType = response.body().contentType();
if ("text".equalsIgnoreCase(originalContentType.type())
&& "xml".equalsIgnoreCase(originalContentType.subtype())
&& originalContentType.charset() == null) {
final String peek = response.peekBody(64).string();
final Matcher matcher = P_XML_PRAGMA.matcher(peek);
if (matcher.find()) {
final String encoding = matcher.group(1);
final MediaType contentType = MediaType.get(originalContentType.type() + '/'
+ originalContentType.subtype() + ";charset=" + encoding);
final ResponseBody body = response.body();
final Builder responseBuilder = response.newBuilder();
responseBuilder.header(HEADER_CONTENT_TYPE, contentType.toString());
responseBuilder.body(ResponseBody.create(contentType, body.contentLength(), body.source()));
response = responseBuilder.build();
log.info("Derived missing {} encoding from XML pragma", encoding);
}
}
return response;
}
};
final OkHttpClient.Builder builder = new OkHttpClient.Builder(); final OkHttpClient.Builder builder = new OkHttpClient.Builder();
builder.followRedirects(false); builder.followRedirects(false);
builder.followSslRedirects(true); builder.followSslRedirects(true);
@ -98,6 +129,7 @@ public final class HttpClient {
builder.writeTimeout(30, TimeUnit.SECONDS); builder.writeTimeout(30, TimeUnit.SECONDS);
builder.readTimeout(30, TimeUnit.SECONDS); builder.readTimeout(30, TimeUnit.SECONDS);
builder.addNetworkInterceptor(loggingInterceptor); builder.addNetworkInterceptor(loggingInterceptor);
builder.addInterceptor(xmlEncodingInterceptor);
OKHTTP_CLIENT = builder.build(); OKHTTP_CLIENT = builder.build();
} }