Issue 4160 - Return headers in AndroidWebRequest

libadblockplus-android/src/org/adblockplus/android/AndroidWebRequest.java

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2016 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 111 matching lines @@
 
           while ((character = reader.read()) != -1)
           {
             sb.append((char) character);
           }
         }
 
         response.setStatus(NsStatus.OK);
         response.setResponse(sb.toString());
 
-        //  headers

[René Jeschke, 2016/07/12 16:05:09]

This comment can be removed.

[anton, 2016/07/13 06:31:19]

Acknowledged.

-        if (connection.getHeaderFields().size() > 0) {

[René Jeschke, 2016/07/12 16:05:09]

Please pay attention to our coding style. Opening braces go to the next line.

And, for the sake of readability, put braces around every block. (See
https://issues.adblockplus.org/ticket/4240 )

[anton, 2016/07/13 06:31:19]

Acknowledged.

+        if (connection.getHeaderFields().size() > 0)
+        {
           List<HeaderEntry> responseHeaders = new LinkedList<HeaderEntry>();
-            for (Map.Entry<String, List<String>> eachEntry :

[René Jeschke, 2016/07/12 16:05:09]

Please pay attention to indentation, this line (and the following) are wrongly
indented (too much).

[anton, 2016/07/13 06:31:19]

Acknowledged.

-              connection.getHeaderFields().entrySet())
-              for (String eachValue : eachEntry.getValue())
-                if (eachEntry.getKey() != null && eachValue != null)
-                  responseHeaders.add(new HeaderEntry(eachEntry.getKey(), eachValue));
+          for (Map.Entry<String, List<String>> eachEntry : connection.getHeaderFields().entrySet())
+          {
+            for (String eachValue : eachEntry.getValue())
+            {
+              if (eachEntry.getKey() != null && eachValue != null)
+              {
+                responseHeaders.add(new HeaderEntry(eachEntry.getKey(), eachValue));
+              }
+            }
+          }
           response.setReponseHeaders(responseHeaders);
         }
 
         connection.disconnect();
       }
       else
       {
         response.setStatus(NsStatus.ERROR_FAILURE);
       }
       return response;
     }
     catch (final Throwable t)
     {
       throw new AdblockPlusException("WebRequest failed", t);
     }
   }
 }