Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Side by Side Diff: libadblockplus-android/src/org/adblockplus/android/AndroidWebRequest.java

Issue 29346561: Issue 4160 - Return headers in AndroidWebRequest (Closed)
Patch Set: Codestyle fixes Created July 13, 2016, 6:32 a.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * This file is part of Adblock Plus <https://adblockplus.org/>, 2 * This file is part of Adblock Plus <https://adblockplus.org/>,
3 * Copyright (C) 2006-2016 Eyeo GmbH 3 * Copyright (C) 2006-2016 Eyeo GmbH
4 * 4 *
5 * Adblock Plus is free software: you can redistribute it and/or modify 5 * Adblock Plus is free software: you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License version 3 as 6 * it under the terms of the GNU General Public License version 3 as
7 * published by the Free Software Foundation. 7 * published by the Free Software Foundation.
8 * 8 *
9 * Adblock Plus is distributed in the hope that it will be useful, 9 * Adblock Plus is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
122 122
123 while ((character = reader.read()) != -1) 123 while ((character = reader.read()) != -1)
124 { 124 {
125 sb.append((char) character); 125 sb.append((char) character);
126 } 126 }
127 } 127 }
128 128
129 response.setStatus(NsStatus.OK); 129 response.setStatus(NsStatus.OK);
130 response.setResponse(sb.toString()); 130 response.setResponse(sb.toString());
131 131
132 // headers 132 if (connection.getHeaderFields().size() > 0)
133 if (connection.getHeaderFields().size() > 0) { 133 {
134 List<HeaderEntry> responseHeaders = new LinkedList<HeaderEntry>(); 134 List<HeaderEntry> responseHeaders = new LinkedList<HeaderEntry>();
135 for (Map.Entry<String, List<String>> eachEntry : 135 for (Map.Entry<String, List<String>> eachEntry :
136 connection.getHeaderFields().entrySet()) 136 connection.getHeaderFields().entrySet())
137 {
137 for (String eachValue : eachEntry.getValue()) 138 for (String eachValue : eachEntry.getValue())
139 {
138 if (eachEntry.getKey() != null && eachValue != null) 140 if (eachEntry.getKey() != null && eachValue != null)
139 responseHeaders.add(new HeaderEntry(eachEntry.getKey(), eachVa lue)); 141 responseHeaders.add(new HeaderEntry(eachEntry.getKey(), eachVa lue));
142 }
143 }
140 response.setReponseHeaders(responseHeaders); 144 response.setReponseHeaders(responseHeaders);
141 } 145 }
142 146
143 connection.disconnect(); 147 connection.disconnect();
144 } 148 }
145 else 149 else
146 { 150 {
147 response.setStatus(NsStatus.ERROR_FAILURE); 151 response.setStatus(NsStatus.ERROR_FAILURE);
148 } 152 }
149 return response; 153 return response;
150 } 154 }
151 catch (final Throwable t) 155 catch (final Throwable t)
152 { 156 {
153 throw new AdblockPlusException("WebRequest failed", t); 157 throw new AdblockPlusException("WebRequest failed", t);
154 } 158 }
155 } 159 }
156 } 160 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld