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 114 matching lines @@
             sb.append((char) character);
           }
         }
 
         response.setStatus(NsStatus.OK);
         response.setResponse(sb.toString());
 
         if (connection.getHeaderFields().size() > 0)
         {
           List<HeaderEntry> responseHeaders = new LinkedList<HeaderEntry>();
-            for (Map.Entry<String, List<String>> eachEntry : connection.getHeaderFields().entrySet())

[anton, 2016/07/19 09:50:30]

decided to fit it into 1 line (though it's 101 character length not to loose
readability)

[diegocarloslima, 2016/09/06 23:02:14]

This 'for' block still have wrong indentation. It should be aligned with the
previous line 'List<HeaderEntry> ...'

[anton, 2016/09/08 13:27:44]

Acknowledged.

+          for (Map.Entry<String, List<String>> eachEntry : connection.getHeaderFields().entrySet())
+          {
+            for (String eachValue : eachEntry.getValue())
             {
-              for (String eachValue : eachEntry.getValue())
+              if (eachEntry.getKey() != null && eachValue != null)
               {
-                if (eachEntry.getKey() != null && eachValue != null)
-                {
-                  responseHeaders.add(new HeaderEntry(eachEntry.getKey(), eachValue));
-                }
+                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);
     }
   }
 }