Issue 5010 - Allow to preload subscription files

libadblockplus-android/src/org/adblockplus/libadblockplus/android/AndroidWebRequestResourceWrapper.java

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2016 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 58 matching lines @@
     "https://easylist-downloads.adblockplus.org/liste_fr+easylist.txt";
   public static final String EASYLIST_ROMANIAN =
     "https://easylist-downloads.adblockplus.org/rolist+easylist.txt";
   public static final String EASYLIST_RUSSIAN =
     "https://easylist-downloads.adblockplus.org/ruadlist+easylist.txt";
   public static final String ACCEPTABLE_ADS =
     "https://easylist-downloads.adblockplus.org/exceptionrules.txt";
 
   private Context context;
   private WebRequest request;
-  private Map<String, Integer> URLtoResouceIdMap;
+  private Map<String, Integer> urlToResourceIdMap;
   private Storage storage;
   private Listener listener;
 
   /**
    * Constructor
    * @param context android context
    * @param request wrapped request to perform the request if it's not preloaded subscription requested
-   * @param URLtoResourceIdMap map URL -> android resource id for preloaded subscriptions
+   * @param urlToResourceIdMap map URL -> android resource id for preloaded subscriptions
    *                           See AndroidWebRequestResourceWrapper.EASYLIST_... constants
    * @param storage Storage impl to remember served interceptions
    */
   public AndroidWebRequestResourceWrapper(Context context, WebRequest request,
-                                          Map<String, Integer> URLtoResourceIdMap,

[anton, 2017/03/20 08:28:46]

using map allows to pass multiple mappings and describe preloaded subscriptions
for multiple locales

+                                          Map<String, Integer> urlToResourceIdMap,
                                           Storage storage)
   {
     this.context = context;
     this.request = request;
-    this.URLtoResouceIdMap = Collections.synchronizedMap(URLtoResourceIdMap);
+    this.urlToResourceIdMap = Collections.synchronizedMap(urlToResourceIdMap);
     this.storage = storage;
   }
 
   public Listener getListener()
   {
     return listener;
   }
 
   public void setListener(Listener listener)
   {
     this.listener = listener;
   }
 
   @Override
   public ServerResponse httpGET(String url, List<HeaderEntry> headers)
   {
     // since parameters may vary we need to ignore them
     String urlWithoutParams = url.substring(0, url.indexOf("?"));
-    Integer resourceId = URLtoResouceIdMap.get(urlWithoutParams);
+    Integer resourceId = urlToResourceIdMap.get(urlWithoutParams);
 
     if (resourceId != null)
     {
       if (!storage.contains(urlWithoutParams))
       {
         Log.w(TAG, "Intercepting request for " + url + " with resource #" + resourceId.intValue());
         ServerResponse response = buildResourceContentResponse(resourceId);
         storage.put(urlWithoutParams);
 
         if (listener != null)
@@ skipping 72 matching lines @@
   @Override
   public void dispose()
   {
     request.dispose();
     super.dispose();
   }
 
   /**
    * Listener for events
    */
   public interface Listener

[anton, 2017/03/20 08:28:45]

listener is introduced for the only purpose - we need to force update
subscriptions right after we returned preloaded response.
I decided not to pass FilterEngine instance here directly and not to have this
strong logics, but delegate the required actions to app.
So it's up to app logics if we need to force update or not. BTW listener is
optional

   {
     void onIntercepted(String url, int resourceId);
   }
 
   /**
    * Interface to remember intercepted subscription requests
    */
   public interface Storage
   {
     void put(String url);
     boolean contains(String url);
   }
 
   /**
    * Storage impl in Shared Preferences
    */
   public static class SharedPrefsStorage implements Storage

[anton, 2017/03/20 08:28:46]

The only iml for now. Since we use SharedPrefsStorage for adblock settings too,
i assume we don't need another impls for now.

   {
     private static final String URLS = "urls";
 
     private SharedPreferences prefs;
     private Set<String> urls;
 
     public SharedPrefsStorage(SharedPreferences prefs)
     {
       this.prefs = prefs;
       this.urls = prefs.getStringSet(URLS, new HashSet<String>());
@@ skipping 10 matching lines @@
         .commit();
     }
 
     @Override
     public synchronized boolean contains(String url)
     {
       return urls.contains(url);
     }
   }
 }