Issue 303 - Don't load element hiding rules

src/org/adblockplus/android/AndroidWebRequest.java

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2015 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 23 matching lines @@
 import android.util.Log;
 
 public class AndroidWebRequest extends WebRequest
 {
   public final static String TAG = Utils.getTag(WebRequest.class);
 
   private final HashSet<String> subscriptionURLs = new HashSet<String>();
 
   private boolean isListedSubscriptionUrl(final URL url)
   {
-    final String toCheck;
+    String toCheck = url.toString();
 
-    if (url.getQuery() != null)

[Felix Dahlke, 2015/01/27 08:40:51]

It seems to me this conditional logic is pointless - lines 48-50 can handle the
case where there's no `?` in the URL, so it seems we can replace this if/else
block by these three lines.

+    final int idx = toCheck.indexOf('?');
+    if (idx != -1)
     {
-      final String tmp = url.toString();
-      final int idx = tmp.indexOf('?');
-      toCheck = idx != -1 ? tmp.substring(0, idx) : tmp;
-    }
-    else
-    {
-      toCheck = url.toString();
+      toCheck = toCheck.substring(0, idx);
     }
 
     return this.subscriptionURLs.contains(toCheck);
   }
 
   protected void updateSubscriptionURLs(final FilterEngine engine)
   {
     for (final org.adblockplus.libadblockplus.Subscription s : engine.fetchAvailableSubscriptions())
     {
       this.subscriptionURLs.add(s.getProperty("url").toString());
@@ skipping 63 matching lines @@
         response.setStatus(NsStatus.ERROR_FAILURE);
       }
       return response;
     }
     catch (final Throwable t)
     {
       throw new AdblockPlusException("WebRequest failed", t);
     }
   }
 }