| OLD | NEW |
| 1 /* | 1 /* |
| 2 * This file is part of Adblock Plus <http://adblockplus.org/>, | 2 * This file is part of Adblock Plus <http://adblockplus.org/>, |
| 3 * Copyright (C) 2006-2014 Eyeo GmbH | 3 * Copyright (C) 2006-2014 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 |
| 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
| 12 * GNU General Public License for more details. | 12 * GNU General Public License for more details. |
| 13 * | 13 * |
| 14 * You should have received a copy of the GNU General Public License | 14 * You should have received a copy of the GNU General Public License |
| 15 * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>. | 15 * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>. |
| 16 */ | 16 */ |
| 17 | 17 |
| 18 package org.adblockplus.android; | 18 package org.adblockplus.android; |
| 19 | 19 |
| 20 import java.io.InputStream; | 20 import java.io.BufferedReader; |
| 21 import java.io.InputStreamReader; |
| 21 import java.net.HttpURLConnection; | 22 import java.net.HttpURLConnection; |
| 22 import java.net.URL; | 23 import java.net.URL; |
| 23 import java.util.List; | 24 import java.util.List; |
| 25 import java.util.Locale; |
| 24 | 26 |
| 25 import org.adblockplus.libadblockplus.AdblockPlusException; | 27 import org.adblockplus.libadblockplus.AdblockPlusException; |
| 26 import org.adblockplus.libadblockplus.HeaderEntry; | 28 import org.adblockplus.libadblockplus.HeaderEntry; |
| 27 import org.adblockplus.libadblockplus.ServerResponse; | 29 import org.adblockplus.libadblockplus.ServerResponse; |
| 30 import org.adblockplus.libadblockplus.ServerResponse.NsStatus; |
| 28 import org.adblockplus.libadblockplus.WebRequest; | 31 import org.adblockplus.libadblockplus.WebRequest; |
| 29 import org.adblockplus.libadblockplus.ServerResponse.NsStatus; | 32 import org.apache.commons.lang.StringUtils; |
| 30 | 33 |
| 31 import android.util.Log; | 34 import android.util.Log; |
| 32 | 35 |
| 33 public class AndroidWebRequest extends WebRequest | 36 public class AndroidWebRequest extends WebRequest |
| 34 { | 37 { |
| 35 public final String TAG = Utils.getTag(WebRequest.class); | 38 public final static String TAG = Utils.getTag(WebRequest.class); |
| 36 | 39 |
| 37 private static final int INITIAL_BUFFER_SIZE = 65536; | 40 private static boolean mightBeFilterList(URL url) |
| 38 private static final int BUFFER_GROWTH_DELTA = 65536; | 41 { |
| 42 final String filename = url.getPath(); |
| 43 |
| 44 return StringUtils.isNotEmpty(filename) && filename.toLowerCase(Locale.US).t
rim().endsWith(".txt"); |
| 45 } |
| 39 | 46 |
| 40 @Override | 47 @Override |
| 41 public ServerResponse httpGET(final String urlStr, final List<HeaderEntry> hea
ders) | 48 public ServerResponse httpGET(final String urlStr, final List<HeaderEntry> hea
ders) |
| 42 { | 49 { |
| 43 try | 50 try |
| 44 { | 51 { |
| 45 final URL url = new URL(urlStr); | 52 final URL url = new URL(urlStr); |
| 46 Log.d(this.TAG, "Downloading from: " + url); | 53 Log.d(TAG, "Downloading from: " + url); |
| 54 |
| 55 final boolean mightBeFilterList = mightBeFilterList(url); |
| 47 | 56 |
| 48 final HttpURLConnection connection = (HttpURLConnection) url.openConnectio
n(); | 57 final HttpURLConnection connection = (HttpURLConnection) url.openConnectio
n(); |
| 49 connection.setRequestMethod("GET"); | 58 connection.setRequestMethod("GET"); |
| 50 connection.connect(); | 59 connection.connect(); |
| 51 | 60 |
| 52 final ServerResponse response = new ServerResponse(); | 61 final ServerResponse response = new ServerResponse(); |
| 53 response.setResponseStatus(connection.getResponseCode()); | 62 response.setResponseStatus(connection.getResponseCode()); |
| 54 | 63 |
| 55 if (response.getResponseStatus() == 200) | 64 if (response.getResponseStatus() == 200) |
| 56 { | 65 { |
| 57 final InputStream in = connection.getInputStream(); | 66 final BufferedReader reader = new BufferedReader(new InputStreamReader(c
onnection.getInputStream(), "UTF-8")); |
| 67 final StringBuilder sb = new StringBuilder(); |
| 58 | 68 |
| 59 final byte[] buffer = new byte[4096]; | 69 if (mightBeFilterList) |
| 70 { |
| 71 String line; |
| 72 while ((line = reader.readLine()) != null) |
| 73 { |
| 74 // We're only appending non-element-hiding filters here. |
| 75 // See: https://issues.adblockplus.org/ticket/303 |
| 76 if (line.indexOf('#') == -1) |
| 77 { |
| 78 sb.append(line); |
| 79 sb.append('\n'); |
| 80 } |
| 81 } |
| 82 } |
| 83 else |
| 84 { |
| 85 int character; |
| 60 | 86 |
| 61 byte[] out = new byte[INITIAL_BUFFER_SIZE]; | 87 while ((character = reader.read()) != -1) |
| 62 | |
| 63 int pos = 0; | |
| 64 for (;;) | |
| 65 { | |
| 66 final int read = in.read(buffer); | |
| 67 if (read < 0) | |
| 68 { | 88 { |
| 69 break; | 89 sb.append((char) character); |
| 70 } | 90 } |
| 71 if (pos + read > out.length) | |
| 72 { | |
| 73 final byte[] old = out; | |
| 74 out = new byte[out.length + BUFFER_GROWTH_DELTA]; | |
| 75 System.arraycopy(old, 0, out, 0, pos); | |
| 76 } | |
| 77 System.arraycopy(buffer, 0, out, pos, read); | |
| 78 pos += read; | |
| 79 } | 91 } |
| 80 | 92 |
| 81 connection.disconnect(); | 93 connection.disconnect(); |
| 82 | 94 |
| 83 response.setStatus(NsStatus.OK); | 95 response.setStatus(NsStatus.OK); |
| 84 response.setResponse(new String(out, 0, pos, "utf-8")); | 96 response.setResponse(sb.toString()); |
| 85 } | 97 } |
| 86 else | 98 else |
| 87 { | 99 { |
| 88 response.setStatus(NsStatus.ERROR_FAILURE); | 100 response.setStatus(NsStatus.ERROR_FAILURE); |
| 89 } | 101 } |
| 90 return response; | 102 return response; |
| 91 } | 103 } |
| 92 catch (final Throwable t) | 104 catch (final Throwable t) |
| 93 { | 105 { |
| 94 throw new AdblockPlusException("WebRequest failed", t); | 106 throw new AdblockPlusException("WebRequest failed", t); |
| 95 } | 107 } |
| 96 } | 108 } |
| 97 } | 109 } |
| OLD | NEW |