Issue 3916 - Supporting Adding filter lists via URL

adblockplussbrowser/src/org/adblockplus/sbrowser/contentblocker/MoreBlockingPreferenceCategory.java

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-present 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
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 package org.adblockplus.sbrowser.contentblocker;
 
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import org.adblockplus.sbrowser.contentblocker.engine.DefaultSubscriptionInfo;
 import org.adblockplus.sbrowser.contentblocker.engine.Engine;
 import org.adblockplus.sbrowser.contentblocker.engine.EngineService;
 import org.adblockplus.sbrowser.contentblocker.engine.SubscriptionInfo;
 import org.adblockplus.adblockplussbrowser.R;
 import org.adblockplus.sbrowser.contentblocker.preferences.MultilineCheckBoxPreference;
 
 import android.content.Context;
 import android.preference.Preference;
@@ skipping 16 matching lines @@
   };
 
   private static final String[] WHITELISTED_LIST_URLS =
   {
       "https://easylist-downloads.adblockplus.org/easyprivacy.txt",
       "https://easylist-downloads.adblockplus.org/malwaredomains_full.txt",
       "https://easylist-downloads.adblockplus.org/antiadblockfilters.txt",
       "https://easylist-downloads.adblockplus.org/fanboy-social.txt"
   };
 
-  public static final HashMap<String, Integer> URL_TO_RES_ID_MAP = new HashMap<>();

[anton, 2017/10/10 06:28:06]

according to "programming to interface" i'd prefer it to be `Map .. = new
HashMap()`. Or are you using any HashMap-specific methods that are missing in
Map? Are there any other reasons?

[jens, 2017/10/10 08:09:10]

I did not introduce URL_TO_RES_ID_MAP but only changed its visibility. But you
are right, as we only use put and get, it can also be used as Map. Shouldn't we
do that in a separate ticket?

[anton, 2017/10/10 08:15:06]

okay, then it's fine for now

[diegocarloslima, 2017/10/10 13:08:28]

URL_TO_RES_ID_MAP is now only used here, isn't it? If so, we can keep it as
private

[jens, 2017/10/10 13:56:40]

As I have to make changes anyways, I'll change that too now.

[jens, 2017/10/10 13:56:41]

Acknowledged.

+  private static final Map<String, Integer> URL_TO_RES_ID_MAP = new HashMap<>();
 
   static
   {
     for (int i = 0; i < WHITELISTED_LIST_TITLES.length; i++)
     {
       URL_TO_RES_ID_MAP.put(WHITELISTED_LIST_URLS[i], WHITELISTED_LIST_TITLES[i]);
     }
   }
 
   public MoreBlockingPreferenceCategory(final Context context)
@@ skipping 128 matching lines @@
   {
     List<SubscriptionInfo> moreBlockingPreferenceSubscriptions = new ArrayList<>(5);
     for (SubscriptionInfo sub : engine.getListedSubscriptions())
     {
       final DefaultSubscriptionInfo info = engine.getDefaultSubscriptionInfoForUrl(sub.getUrl());
       Integer resInt = URL_TO_RES_ID_MAP.get(sub.getUrl());
 
       if (sub.getType() == SubscriptionInfo.Type.CUSTOM)
       {
         moreBlockingPreferenceSubscriptions.add(sub);
+        continue;
       }
 
       if (info != null && !info.isComplete() && sub.isEnabled())
       {
         moreBlockingPreferenceSubscriptions.add(sub);
+        continue;
       }
 
       if ((!(engine.isAcceptableAdsUrl(sub)) || sub.getTitle().startsWith("__"))
           && resInt != null
           && (info == null || info.getPrefixes().isEmpty() || sub.getType() != SubscriptionInfo.Type.ADS))
       {
         moreBlockingPreferenceSubscriptions.add(sub);
+        continue;
       }
     }
 
     return moreBlockingPreferenceSubscriptions;
   }
 
   @Override
   public boolean onPreferenceChange(final Preference preference, final Object newValue)
   {
     final String id = preference.getKey();
     final boolean enabled = (Boolean) newValue;
 
     this.engine.changeSubscriptionState(id, enabled);
 
     return true;
   }
 
   @Override
   public void subscriptionAdded()
   {
     refreshEntries();
   }
 }