Issue 5088 - Remove code duplicate for refresh subscriptions

libadblockplus-android/src/org/adblockplus/libadblockplus/android/AdblockEngine.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 24 matching lines @@
 import org.adblockplus.libadblockplus.JsEngine;
 import org.adblockplus.libadblockplus.JsValue;
 import org.adblockplus.libadblockplus.LogSystem;
 import org.adblockplus.libadblockplus.ShowNotificationCallback;
 import org.adblockplus.libadblockplus.Subscription;
 import org.adblockplus.libadblockplus.UpdateAvailableCallback;
 import org.adblockplus.libadblockplus.UpdateCheckDoneCallback;
 import org.adblockplus.libadblockplus.WebRequest;
 
 import android.content.Context;
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager.NameNotFoundException;

[anton, 2017/04/03 06:17:54]

not related by the task, but desired clean-up

 import android.os.Build.VERSION;
 import android.os.Handler;
 import android.os.Looper;
 import android.util.Log;
 
 public final class AdblockEngine
 {
   // default base path to store subscription files in android app
   public static final String BASE_PATH_DIRECTORY = "adblock";
 
@@ skipping 187 matching lines @@
   }
 
   public static Builder builder(AppInfo appInfo, String basePath)
   {
     return new Builder(appInfo, basePath);
   }
 
   private final AndroidWebRequestResourceWrapper.Listener resourceWrapperListener =
     new AndroidWebRequestResourceWrapper.Listener()
   {
-    private static final int UPDATE_DELAY_MS = 1 * 1000;

[anton, 2017/04/03 06:17:54]

I'm not sure that 'refresh' is better than 'update' for subscriptions updating
but we had 'refreshSubscriptions()' method in original AdblockEngine class. Also
if someone already uses libadblockplus-android API it's preferred not to rename
existing methods. 

So i use ''refresh' everywhere below in terms of 'update' subscriptions.

[diegocarloslima, 2017/04/07 09:36:54]

Well, I think that update is a better term in this case than refresh. For
someone already used to the API, maybe refresh makes more sense, but for someone
new to it, update would be easier to understand. I wouldn't insist, but I would
prefer update to be used.

[Felix Dahlke, 2017/04/10 11:59:47]

I'd also go for "update", since that's the terminology we use in Libadblockplus
as well (there is no function for updating all subscriptions, but there is
Subscription::UpdateFilters).

Since libadblockplus-android is relatively new (the only user we're aware of is
ZTE), we can probably still safely break the API.

+    private static final int REFRESH_DELAY_MS = 1 * 1000;
 
     private final Handler handler = new Handler(Looper.getMainLooper());
 
-    private final Runnable forceUpdateRunnable = new Runnable()
+    private final Runnable forceRefreshRunnable = new Runnable()
     {
       public void run() {
         // Filter Engine can be already disposed
         if (filterEngine != null)
         {
-          Log.d(TAG, "Force update subscriptions");
-          List<Subscription> subscriptions = filterEngine.getListedSubscriptions();
-          for (Subscription eachSubscription : subscriptions)
-          {
-            try
-            {
-              eachSubscription.updateFilters();
-            }
-            finally
-            {
-              eachSubscription.dispose();
-            }
-          }
+          Log.d(TAG, "Force refresh subscriptions");
+          AdblockEngine.this.refreshSubscriptions();
         }
       }
     };
 
     @Override
     public void onIntercepted(String url, int resourceId)
     {
-      // we need to force update subscriptions ASAP after preloaded one is returned
-      // but we should note that multiple interceptions (for main easylist and AA) and force update once only
+      // we need to force refresh subscriptions ASAP after preloaded one is returned
+      // but we should note that multiple interceptions (for main easylist and AA) and force refresh once only
 
-      // adding into main thread queue to avoid concurrency issues (start update while updating)
+      // adding into main thread queue to avoid concurrency issues (start refresh while refreshing)
       // as usually onIntercepted() is invoked in background thread
-      handler.removeCallbacks(forceUpdateRunnable);
-      handler.postDelayed(forceUpdateRunnable, UPDATE_DELAY_MS);
+      handler.removeCallbacks(forceRefreshRunnable);
+      handler.postDelayed(forceRefreshRunnable, REFRESH_DELAY_MS);
 
-      Log.d(TAG, "Scheduled force update in " + UPDATE_DELAY_MS);
+      Log.d(TAG, "Scheduled force refresh in " + REFRESH_DELAY_MS);
     }
   };
 
   public void dispose()
   {
     Log.w(TAG, "Dispose");
 
     // engines first
     if (this.filterEngine != null)
     {
@@ skipping 424 matching lines @@
   public void setWhitelistedDomains(List<String> domains)
   {
     this.whitelistedDomains = domains;
   }
 
   public List<String> getWhitelistedDomains()
   {
     return whitelistedDomains;
   }
 }