Issue 6066 - Implement 'force update' functionality for subscriptions

adblockplussbrowser/src/main/java/org/adblockplus/sbrowser/contentblocker/MainPreferences.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 186 matching lines @@
     }
 
     if (this.dialogTitleResId == R.string.initialization_title)
     {
       this.dismissDialog();
 
       this.checkForCompatibleSBrowserAndProceed();
     }
 
     Fragment preferecesFragment = getFragmentManager().findFragmentByTag(Preferences.class.getSimpleName());
-    Preference button = ((Preferences) preferecesFragment).findPreference(getString(R.string.key_update_subscriptions));
+    Preference button = ((Preferences) preferecesFragment).findPreference(getString(R.string.key_force_update_subscriptions));
     button.setOnPreferenceClickListener(this);
   }
 
   @Override
   public void onSharedPreferenceChanged(String key)
   {
     if (this.getString(R.string.key_automatic_updates).equals(key) && this.engine != null)
     {
       this.engine.connectivityChanged();
     }
@@ skipping 23 matching lines @@
 
   @Override
   public void subscriptionUpdatedApplied()
   {
     this.dismissDialog();
   }
 
   @Override
   public boolean onPreferenceClick(Preference preference)
   {
-    if (getString(R.string.key_update_subscriptions).equals(preference.getKey()))
-    {
-      boolean hasInternet = ConnectivityUtils.hasInternetConncetion(this);
-      if (hasInternet && ConnectivityUtils.hasWifiConncetion(this))
+    if (getString(R.string.key_force_update_subscriptions).equals(preference.getKey()))
+    {
+      if (ConnectivityUtils.hasNonMeteredConnection(this))
       {
         engine.forceUpdateSubscriptions(false);
       }
       else
       {
+        boolean meteredInternetAvailable = ConnectivityUtils.canUseInternet(this, true);
         this.dialog = new AlertDialog.Builder(this)
             .setTitle(R.string.update_subscriptions)
-            .setMessage(hasInternet ?

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

i prefer long ?: to look like this:

condition
? do1
: do2
for readability. Not insisting.

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

Acknowledged.

-                R.string.metered_connection_warning : R.string.check_your_connection)
+            .setMessage(
+                meteredInternetAvailable
+                ? R.string.metered_connection_warning
+                : R.string.check_your_connection)
             .setNegativeButton(android.R.string.cancel, new OnClickListener()
             {
               @Override
               public void onClick(DialogInterface dialog, int which)
               {
                 dialog.cancel();
               }
             })
             .create();
 
-        if (hasInternet)
+        if (meteredInternetAvailable)
         {
           this.dialog.setButton(DialogInterface.BUTTON_POSITIVE, getString(android.R.string.yes),
               new OnClickListener()
               {
                 @Override
                 public void onClick(DialogInterface dialogInterface, int i)
                 {
                   engine.forceUpdateSubscriptions(true);
                 }
               });
         }
         this.dialog.show();
       }
       return true;
     }
     return false;
   }
 }