Issue 4948 - add possibility to not send data depending on connection properties

libadblockplus-android-settings/src/org/adblockplus/libadblockplus/android/settings/ConnectionType.java

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2016 Eyeo GmbH

[Felix Dahlke, 2017/03/24 07:37:24]

2017 :)

[anton, 2017/03/24 09:43:11]

Yes, i've left it 2016 as i will update 2016 to 2017 in all the files at once in
separate task.

[Felix Dahlke, 2017/03/27 14:18:11]

Acknowledged.

  *
  * 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.libadblockplus.android.settings;
 
 import android.net.ConnectivityManager;
 
 public enum ConnectionType {
 
   // All WiFi networks
-  WIFI(
-    "wifi",
-    new ConnectionChecker()
+  WIFI("wifi")
+  {
+    @Override
+    public boolean isRequiredConnection(ConnectivityManager manager)
     {
-      @Override
-      public boolean isRequiredConnection(ConnectivityManager manager)
-      {
-        return manager.getActiveNetworkInfo().getType() == ConnectivityManager.TYPE_WIFI;
-      }
-    }),
+      return manager.getActiveNetworkInfo().getType() == ConnectivityManager.TYPE_WIFI;
+    }
+  },
 
   // Non-metered WiFi networks
-  WIFI_NON_METERED(
-    "wifi_non_metered",
-    new ConnectionChecker()
+  WIFI_NON_METERED("wifi_non_metered")
+  {
+    @Override
+    public boolean isRequiredConnection(ConnectivityManager manager)
     {
-      @Override
-      public boolean isRequiredConnection(ConnectivityManager manager)
-      {
-        return
-          manager.getActiveNetworkInfo().getType() == ConnectivityManager.TYPE_WIFI &&
-          !manager.isActiveNetworkMetered();
+      return
+        manager.getActiveNetworkInfo().getType() == ConnectivityManager.TYPE_WIFI &&
+        !manager.isActiveNetworkMetered();
     }
-  }),
+  },
 
   // Any connection
-  ANY(
-    "any",
-    new ConnectionChecker()
+  ANY("any")
+  {
+    @Override
+    public boolean isRequiredConnection(ConnectivityManager manager)
     {
-      @Override
-      public boolean isRequiredConnection(ConnectivityManager manager)
-      {
-        return true;
-      }
-    });
+      return true;
+    }
+  };
 
   private String value;
-  private ConnectionChecker checker;
 
   public String getValue()
   {
     return value;
   }
 
-  public ConnectionChecker getChecker()
-  {
-    return checker;
-  }
+  // check if current device connection type is equal to this concrete connection type
+  public abstract boolean isRequiredConnection(ConnectivityManager manager);
 
-  ConnectionType(String value, ConnectionChecker checker)
+  ConnectionType(String value)
   {
     this.value = value;
-    this.checker = checker;
-  }
-
-  interface ConnectionChecker
-  {
-    boolean isRequiredConnection(ConnectivityManager manager);
   }
 
   public static ConnectionType findByValue(String value)
   {
     if (value == null)
     {
       return null;
     }
 
     for (ConnectionType eachConnectionType : ConnectionType.values())
     {
       if (eachConnectionType.getValue().equals(value))
       {
         return eachConnectionType;
       }
     }
 
     // not found
     return null;
   }
 }