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 231 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 REFRESH_DELAY_MS = 1 * 1000;
+    private static final int UPDATE_DELAY_MS = 1 * 1000;
 
     private final Handler handler = new Handler(Looper.getMainLooper());
 
-    private final Runnable forceRefreshRunnable = new Runnable()
+    private final Runnable forceUpdateRunnable = new Runnable()
     {
       public void run() {
         // Filter Engine can be already disposed
         if (filterEngine != null)
         {
-          Log.d(TAG, "Force refresh subscriptions");
-          AdblockEngine.this.refreshSubscriptions();
+          Log.d(TAG, "Force update subscriptions");
+          AdblockEngine.this.updateSubscriptions();
         }
       }
     };
 
     @Override
     public void onIntercepted(String url, int resourceId)
     {
-      // 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 refresh while refreshing)
+      // 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
+
+      // adding into main thread queue to avoid concurrency issues (start update while updating)
       // as usually onIntercepted() is invoked in background thread
-      handler.removeCallbacks(forceRefreshRunnable);
-      handler.postDelayed(forceRefreshRunnable, REFRESH_DELAY_MS);
-
-      Log.d(TAG, "Scheduled force refresh in " + REFRESH_DELAY_MS);
+      handler.removeCallbacks(forceUpdateRunnable);
+      handler.postDelayed(forceUpdateRunnable, UPDATE_DELAY_MS);
+
+      Log.d(TAG, "Scheduled force update in " + UPDATE_DELAY_MS);
     }
   };
 
   public void dispose()
   {
     Log.w(TAG, "Dispose");
 
     // engines first
     if (this.filterEngine != null)
     {
@@ skipping 185 matching lines @@
           sub.addToList();
         }
         finally
         {
           sub.dispose();
         }
       }
     }
   }
 
-  public void refreshSubscriptions()
+  public void updateSubscriptions()
   {
     for (final Subscription s : this.filterEngine.getListedSubscriptions())
     {
       try
       {
         s.updateFilters();
       }
       finally
       {
         s.dispose();
@@ skipping 218 matching lines @@
   public void setWhitelistedDomains(List<String> domains)
   {
     this.whitelistedDomains = domains;
   }
 
   public List<String> getWhitelistedDomains()
   {
     return whitelistedDomains;
   }
 }