Issue 6066 - Implement 'force update' functionality for subscriptions

adblockplussbrowser/src/main/java/org/adblockplus/sbrowser/contentblocker/util/ConnectivityUtils.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
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 package org.adblockplus.sbrowser.contentblocker.util;
 
+import org.adblockplus.adblockplussbrowser.R;
+
 import android.content.Context;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
 
 public class ConnectivityUtils
 {
-  public static boolean hasWifiConncetion(final Context context)

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

typo: `Conncetion`

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

Acknowledged.

+  public static boolean hasNonMeteredConnection(final Context context)
   {
     final ConnectivityManager connManager = (ConnectivityManager) context
         .getSystemService(Context.CONNECTIVITY_SERVICE);
     final NetworkInfo current = connManager.getActiveNetworkInfo();
-    return current != null && current.getType() == ConnectivityManager.TYPE_WIFI;
+
+    if (current != null && current.isConnectedOrConnecting())
+    {
+      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;
   }
 
-  public static boolean hasInternetConncetion(final Context context)

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

same here

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

Acknowledged.

+  public static boolean canUseInternet(final Context serviceContext, final boolean acceptMetered)

[diegocarloslima, 2018/01/23 17:37:16]

Small thing, to make it more generic I think that the Context param should be
called only 'context' instead of 'serviceContext'

[jens, 2018/01/24 09:23:05]

Acknowledged.

   {
-    final ConnectivityManager connManager = (ConnectivityManager) context
+    final ConnectivityManager connManager = (ConnectivityManager) serviceContext
         .getSystemService(Context.CONNECTIVITY_SERVICE);
-    return connManager != null && connManager.getActiveNetworkInfo() != null;
+    final NetworkInfo current = connManager.getActiveNetworkInfo();
+    if (current == null)
+    {
+      return false;
+    }
+
+    if (current.isConnectedOrConnecting() && acceptMetered)
+    {
+      return true;
+    }
+
+    final boolean wifiOnly = "1".equals(SharedPrefsUtils.getString(
+        serviceContext, R.string.key_automatic_updates , "1"));
+
+    if (wifiOnly)
+    {
+      return hasNonMeteredConnection(serviceContext);
+    }
+    return current.isConnectedOrConnecting();
   }
 }