Issue 3916 - Supporting Adding filter lists via URL

adblockplussbrowser/src/org/adblockplus/sbrowser/contentblocker/engine/Engine.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
@@ skipping 56 matching lines @@
   public static final String USER_FILTERS_TITLE = "__filters";
   public static final String USER_EXCEPTIONS_TITLE = "__exceptions";
 
   public static final String SBROWSER_APP_ID = "com.sec.android.app.sbrowser";
   public static final String EASYLIST_URL = "https://easylist-downloads.adblockplus.org/easylist.txt";
   private static final String ACTION_OPEN_SETTINGS = "com.samsung.android.sbrowser.contentBlocker.ACTION_SETTING";
   private static final String ACTION_UPDATE = "com.samsung.android.sbrowser.contentBlocker.ACTION_UPDATE";
 
   public static final String SUBSCRIPTIONS_EXCEPTIONSURL = "subscriptions_exceptionsurl";
 
-  public static final HashMap<String, Integer> URL_TO_RES_ID_MAP = new HashMap<>();

[diegocarloslima, 2017/09/22 17:43:42]

I know that I asked you in the last code review to move this Hash here, but
giving a second look at the code review, I think that it would be better if we
move this back to MoreBlockingPreferenceCategory, along with the
getMoreBlockingPreferencesSubscriptions() method. I feel that the Engine class
is getting way too big and that logic is currently only relevant for the
MoreBlockingPreferenceCategory. What do you think? 

[jens, 2017/09/26 10:25:02]

Acknowledged.

-
   // The value below specifies an interval of [x, 2*x[, where x =
   // INITIAL_UPDATE_CHECK_DELAY
   private static final long INITIAL_UPDATE_CHECK_DELAY = 5 * DateUtils.SECOND_IN_MILLIS;
   private static final long UPDATE_CHECK_INTERVAL = 30 * DateUtils.MINUTE_IN_MILLIS;
   private static final long BROADCAST_COMBINATION_DELAY = 2500;
 
   private static final int NO_FLAG = 0;
   private static final int OLDEST_SAMSUNG_INTERNET_5_VERSIONCODE = 500000000;
 
   private final ReentrantLock accessLock = new ReentrantLock();
@@ skipping 162 matching lines @@
   }
 
   public void subscriptionStateChanged()
   {
     if (this.subscriptionUpdateCallback != null)
     {
       subscriptionUpdateCallback.subscriptionUpdatedApplied();
     }
   }
 
-  public void createAndAddSubscriptionFromUrl(final String url, final SubscriptionAddedCallback callback) throws IOException
+  public void createAndAddSubscriptionFromUrl(final String url,
+      final SubscriptionAddedCallback callback) throws IOException
   {
     final Subscription sub = Subscription.create(url);
     sub.putMeta(Subscription.KEY_TITLE, url);
     sub.setEnabled(true);
     subscriptions.add(sub);
     subscriptions.persistSubscription(sub);
     callback.subscriptionAdded();
   }
 
   public void removeSubscriptionById(final String subscriptionId)
@@ skipping 147 matching lines @@
     engine.wasFirstRun = engine.subscriptions.wasUnitialized();
     if (engine.subscriptions.wasUnitialized())
     {
       Log.d(TAG, "Subscription storage was uninitialized, initializing...");
 
       try (final InputStream easylistTxt = context.getResources().openRawResource(R.raw.easylist))
       {
         final Subscription easylist = engine.subscriptions.add(Subscription
             // Use bundled EasyList as default and update it with locale specific list later
             // see: https://issues.adblockplus.org/ticket/5237
-            .create(SubscriptionUtils.chooseDefaultSubscriptionUrl(engine.defaultSubscriptions.getAdsSubscriptions()))
+            .create(SubscriptionUtils.chooseDefaultSubscriptionUrl(
+                engine.defaultSubscriptions.getAdsSubscriptions()))
             .parseLines(readLines(easylistTxt)));
         easylist.putMeta(Subscription.KEY_UPDATE_TIMESTAMP, "0");
         easylist.setEnabled(true);
       }
       Log.d(TAG, "Added and enabled bundled easylist");
 
       try (final InputStream exceptionsTxt = context.getResources()
           .openRawResource(R.raw.exceptionrules))
       {
         final Subscription exceptions = engine.subscriptions.add(Subscription
@@ skipping 181 matching lines @@
       sb.append(downloadCount);
     }
     else
     {
       sb.append("4%2B"); // "4+" URL encoded
     }
 
     return new URL(sb.toString());
   }
 
-  public List<SubscriptionInfo> getMoreBlockingPreferenceSubscriptions()

[diegocarloslima, 2017/09/22 17:43:43]

Please read my comment above regarding moving this to
MoreBlockingPreferenceCategory

[jens, 2017/09/26 10:25:02]

Acknowledged.

-  {
-    List<SubscriptionInfo> moreBlockingPreferenceSubscriptions = new ArrayList<>(5);
-    for (SubscriptionInfo sub : getListedSubscriptions())
-    {
-      final DefaultSubscriptionInfo info = getDefaultSubscriptionInfoForUrl(sub.getUrl());
-      Integer resInt = URL_TO_RES_ID_MAP.get(sub.getUrl());
-
-      if (sub.getType() == SubscriptionInfo.Type.CUSTOM)
-      {
-        moreBlockingPreferenceSubscriptions.add(sub);
-      }
-
-      if (info != null && !info.isComplete() && sub.isEnabled())
-      {
-        moreBlockingPreferenceSubscriptions.add(sub);
-      }
-
-      if ((!(isAcceptableAdsUrl(sub)) || sub.getTitle().startsWith("__"))
-          && resInt != null
-          && (info == null || info.getPrefixes().isEmpty() || sub.getType() != SubscriptionInfo.Type.ADS))
-      {
-        moreBlockingPreferenceSubscriptions.add(sub);
-      }
-    }
-
-    return moreBlockingPreferenceSubscriptions;
-  }
-
-  private boolean isAcceptableAdsUrl(final SubscriptionInfo subscriptionInfo)

[diegocarloslima, 2017/09/22 17:43:43]

If we move the method above, we should make this public

[jens, 2017/09/26 10:25:02]

Acknowledged.

+  public boolean isAcceptableAdsUrl(final SubscriptionInfo subscriptionInfo)
   {
     return getPrefsDefault(SUBSCRIPTIONS_EXCEPTIONSURL).equals(subscriptionInfo.getUrl());
   }
 
   private static class EventHandler implements Runnable
   {
     private static final String TAG = EventHandler.class.getSimpleName();
     private final Engine engine;
 
     public EventHandler(final Engine engine)
@@ skipping 166 matching lines @@
   {
     void subscriptionUpdateRequested(boolean enabled);
     void subscriptionUpdatedApplied();
   }
 
   public interface SubscriptionAddedCallback
   {
     void subscriptionAdded();
   }
 }