Issue 6066 - Implement 'force update' functionality for subscriptions

adblockplussbrowser/src/main/java/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 25 matching lines @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.TreeSet;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.locks.ReentrantLock;
 
 import org.adblockplus.adblockplussbrowser.R;
+import org.adblockplus.sbrowser.contentblocker.util.ConnectivityUtils;
 import org.adblockplus.sbrowser.contentblocker.util.SharedPrefsUtils;
 import org.adblockplus.sbrowser.contentblocker.util.SubscriptionUtils;
 
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
@@ skipping 134 matching lines @@
       public void run()
       {
         final Intent intent = new Intent();
         intent.setAction(ACTION_UPDATE);
         intent.setData(Uri.parse("package:" + Engine.this.serviceContext.getPackageName()));
         Engine.this.serviceContext.sendBroadcast(intent);
       }
     });
   }
 
-  boolean canUseInternet()
-  {
-    final ConnectivityManager connManager = (ConnectivityManager) this.serviceContext
-        .getSystemService(Context.CONNECTIVITY_SERVICE);
-    final NetworkInfo current = connManager.getActiveNetworkInfo();
-    if (current == null)
-    {
-      return false;
-    }
-
-    if (wasFirstRun())
-    {
-      return true;
-    }
-
-    final boolean wifiOnly = "1".equals(SharedPrefsUtils.getString(
-        this.serviceContext, R.string.key_automatic_updates , "1"));
-
-    if (wifiOnly)
-    {
-      if (current.isConnected() && !current.isRoaming())
-      {
-        switch (current.getType())
-        {
-          case ConnectivityManager.TYPE_BLUETOOTH:
-          case ConnectivityManager.TYPE_ETHERNET:
-          case ConnectivityManager.TYPE_WIFI:
-          case ConnectivityManager.TYPE_WIMAX:
-            return true;
-          default:
-            return false;
-        }
-      }
-      return false;
-    }
-    return current.isConnected();
+  boolean canUseInternet(final boolean allowMetered)
+  {
+    // allow a metered connection to update default subscriptions at the first run.
+    // See https://issues.adblockplus.org/ticket/5237
+    return ConnectivityUtils.canUseInternet(serviceContext, allowMetered || wasFirstRun());
   }
 
   public void forceUpdateSubscriptions(final boolean allowMetered)
   {
     try
     {
       subscriptions.checkForUpdates(true, allowMetered);
       Toast.makeText(serviceContext, serviceContext.getText(R.string.updating_subscriptions), Toast.LENGTH_LONG).show();
     }
     catch (IOException e)
@@ skipping 537 matching lines @@
       this.id = id;
       this.responseCode = responseCode;
       this.response = response;
       if (headers != null)
       {
         this.headers.putAll(headers);
       }
     }
   }
 
-  public void enqueueDownload(final Subscription sub, final boolean forced, final boolean allowMetered) throws IOException

[anton, 2018/01/19 10:53:02]

the line seems to be too long

[jens, 2018/01/19 11:00:28]

Acknowledged.

+  public void enqueueDownload(final Subscription sub, final boolean forced,
+      final boolean allowMetered) throws IOException
   {
     if (sub.getURL() != null && sub.shouldUpdate(forced))
     {
       final HashMap<String, String> headers = new HashMap<>();
       if (sub.isMetaDataValid() && sub.isFiltersValid())
       {
         final String lastModified = sub.getMeta(Subscription.KEY_HTTP_LAST_MODIFIED);
         if (!TextUtils.isEmpty(lastModified))
         {
           headers.put("If-Modified-Since", lastModified);
@@ skipping 18 matching lines @@
   {
     void subscriptionUpdateRequested(boolean enabled);
     void subscriptionUpdatedApplied();
   }
 
   public interface SubscriptionAddedCallback
   {
     void subscriptionAdded();
   }
 }