Issue 6066 - Implement 'force update' functionality for subscriptions

adblockplussbrowser/src/main/java/org/adblockplus/sbrowser/contentblocker/engine/Downloader.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 91 matching lines @@
         connection.getInputStream(), StandardCharsets.UTF_8)))
     {
       for (int ch = r.read(); ch != -1; ch = r.read())
       {
         sb.append((char) ch);
       }
       job.responseText = sb.toString();
     }
   }
 
-  public void enqueueDownload(final URL url, final String id, final Map<String, String> headers)
+  public void enqueueDownload(final URL url, final String id, final Map<String, String> headers,
+      final boolean allowMetered)
   {
     this.lock();
     try
     {
       if (!this.enqueuedIds.contains(id))
       {
         this.enqueuedIds.add(id);
-        this.downloadJobs.add(new DownloadJob(url, id, headers));
+        this.downloadJobs.add(new DownloadJob(url, id, headers, allowMetered));
       }
     }
     finally
     {
       this.unlock();
     }
   }
 
   public static Downloader create(final Engine engine)
   {
@@ skipping 29 matching lines @@
         try
         {
           if (!this.downloader.downloaderEnabled)
           {
             Thread.sleep(30000);
             continue;
           }
           job = this.downloader.downloadJobs.poll(5 * 60, TimeUnit.SECONDS);
           if (job != null)
           {
-            if (this.downloader.engine.canUseInternet())
+            if (this.downloader.engine.canUseInternet() || job.allowMetered)

[diegocarloslima, 2018/01/19 13:59:00]

I know that there's a check in MainPreferences which prevents a download to be
added if there's no internet here, but in the future this can be a source of
problems, because the name suggests that it will be downloaded if there's
metered connection, but it will try to download even if the user doesn't
currently have internet access (when allowMetered is true but there's no
internet connectivity)


Maybe the Engine.canUseInternet should be moved/combined to the new
ConnectivityUtils class and have two definitions
canUseInternet()
canUseInternet(allowMetered) -> which would override the wifiOnly
(key_automatic_updates) preference

[jens, 2018/01/19 14:32:55]

I was already considering to move canUseInternet to the ConnectivityUtils class,
but I thought that should be done in a separate ticket, as canUseInternet needs
a context (which we currently don't have in Downloader.java).

             {
               Log.d(TAG, "Downloading '" + job.id + "' using " + job.url);
               download(job);
               Log.d(TAG, "Downloading '" + job.id + "' finished with response code "
                   + job.responseCode);
               this.downloader.lock();
               try
               {
                 this.downloader.enqueuedIds.remove(job.id);
               }
@@ skipping 53 matching lines @@
         }
       }
       Log.d(TAG, "Handler thread finished");
     }
   }
 
   private static class DownloadJob
   {
     private final URL url;
     private final String id;
+    private final boolean allowMetered;
     private final HashMap<String, String> headers = new HashMap<>();
     private int retryCount = 0;
 
     private int responseCode = 0;
     private final HashMap<String, String> responseHeaders = new HashMap<>();
     private String responseText = null;
 
-    public DownloadJob(final URL url, final String id, final Map<String, String> headers)
+    public DownloadJob(final URL url, final String id, final Map<String, String> headers, boolean allowMetered)
     {
       this.url = url;
       this.id = id;
+      this.allowMetered = allowMetered;
       if (headers != null)
       {
         this.headers.putAll(headers);
       }
     }
   }
 }