Strip content-encoding response header from CronetHttpURLConnection response.

components/cronet/android/java/src/org/chromium/net/urlconnection/CronetHttpURLConnection.java

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.net.urlconnection;
 
 import android.util.Pair;
 
 import org.chromium.base.Log;
 import org.chromium.net.CronetEngine;
 import org.chromium.net.UrlRequest;
 import org.chromium.net.UrlRequestException;
 import org.chromium.net.UrlResponseInfo;
 
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.net.HttpURLConnection;
 import java.net.MalformedURLException;
 import java.net.ProtocolException;
 import java.net.URL;
 import java.nio.ByteBuffer;
+import java.util.AbstractMap;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
 
 /**
  * An implementation of {@link HttpURLConnection} that uses Cronet to send
  * requests and receive responses.
  * @deprecated use {@link CronetEngine#openConnection}.
  */
 @Deprecated
 public class CronetHttpURLConnection extends HttpURLConnection {
     private static final String TAG = "cr.CronetHttpURLConn";
     private static final String CONTENT_LENGTH = "Content-Length";
     private final CronetEngine mCronetEngine;
     private final MessageLoop mMessageLoop;
     private UrlRequest mRequest;
     private final List<Pair<String, String>> mRequestHeaders;
 
     private CronetInputStream mInputStream;
     private CronetOutputStream mOutputStream;
     private UrlResponseInfo mResponseInfo;
     private UrlRequestException mException;
     private boolean mOnRedirectCalled = false;
     private boolean mHasResponse = false;
+    private List<Map.Entry<String, String>> mResponseHeadersList;
+    private Map<String, List<String>> mResponseHeadersMap;
 
     public CronetHttpURLConnection(URL url, CronetEngine cronetEngine) {
         super(url);
         mCronetEngine = cronetEngine;
         mMessageLoop = new MessageLoop();
         mInputStream = new CronetInputStream(this);
         mRequestHeaders = new ArrayList<Pair<String, String>>();
     }
 
     /**
@@ skipping 42 matching lines @@
     /**
      * Returns an unmodifiable map of the response-header fields and values.
      */
     @Override
     public Map<String, List<String>> getHeaderFields() {
         try {
             getResponse();
         } catch (IOException e) {
             return Collections.emptyMap();
         }
-        return mResponseInfo.getAllHeaders();
+        return getAllHeaders();
     }
 
     /**
      * Returns the value of the named header field. If called on a connection
      * that sets the same header multiple times with possibly different values,
      * only the last value is returned.
      */
     @Override
     public final String getHeaderField(String fieldName) {
         try {
             getResponse();
         } catch (IOException e) {
             return null;
         }
-        Map<String, List<String>> map = mResponseInfo.getAllHeaders();
+        Map<String, List<String>> map = getAllHeaders();
         if (!map.containsKey(fieldName)) {
             return null;
         }
         List<String> values = map.get(fieldName);
         return values.get(values.size() - 1);
     }
 
     /**
      * Returns the name of the header field at the given position {@code pos}, or {@code null}
      * if there are fewer than {@code pos} fields.
@@ skipping 399 matching lines @@
 
     /**
      * Helper method to return the response header field at position pos.
      */
     private Map.Entry<String, String> getHeaderFieldEntry(int pos) {
         try {
             getResponse();
         } catch (IOException e) {
             return null;
         }
-        List<Map.Entry<String, String>> headers = mResponseInfo.getAllHeadersAsList();
+        List<Map.Entry<String, String>> headers = getAllHeadersAsList();
         if (pos >= headers.size()) {
             return null;
         }
         return headers.get(pos);
     }
 
     /**
      * Returns whether the client has used {@link #setChunkedStreamingMode} to
      * set chunked encoding for upload.
      */
     private boolean isChunkedUpload() {
         return chunkLength > 0;
     }
+
+    // TODO(xunjieli): Refactor to reuse code in UrlRequestInfo.

[kapishnikov, 2016/03/08 19:37:17]

Did you mean UrlResponseInfo?

[xunjieli, 2016/03/08 19:51:14]

Done.

+    private Map<String, List<String>> getAllHeaders() {
+        if (mResponseHeadersMap != null) {
+            return mResponseHeadersMap;
+        }
+        Map<String, List<String>> map = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
+        for (Map.Entry<String, String> entry : getAllHeadersAsList()) {
+            List<String> values = new ArrayList<String>();
+            if (map.containsKey(entry.getKey())) {
+                values.addAll(map.get(entry.getKey()));
+            }
+            values.add(entry.getValue());
+            map.put(entry.getKey(), Collections.unmodifiableList(values));
+        }
+        mResponseHeadersMap = Collections.unmodifiableMap(map);
+        return mResponseHeadersMap;
+    }
+
+    private List<Map.Entry<String, String>> getAllHeadersAsList() {
+        if (mResponseHeadersList != null) {
+            return mResponseHeadersList;
+        }
+        mResponseHeadersList = new ArrayList<Map.Entry<String, String>>();
+        for (Map.Entry<String, String> entry : mResponseInfo.getAllHeadersAsList()) {
+            // Strips Content-Encoding response header. See crbug.com/592700.
+            if (!entry.getKey().equalsIgnoreCase("Content-Encoding")) {
+                mResponseHeadersList.add(
+                        new AbstractMap.SimpleImmutableEntry<String, String>(entry));
+            }
+        }
+        mResponseHeadersList = Collections.unmodifiableList(mResponseHeadersList);
+        return mResponseHeadersList;
+    }
 }