Proxy configurators

src/org/adblockplus/android/ProxyServerType.java

 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
  * Copyright (C) 2006-2014 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.android;
 
 public enum ProxyServerType
 {
   UNKNOWN,
   /** A pure http proxy */
   HTTP,
   /** Http and https proxy. */
-  HTTPS,
-  /** SOCKS4 */
-  SOCKS4,

[Felix Dahlke, 2014/08/19 09:06:00]

What is this for? We can't do SOCKS, can we?

[René Jeschke, 2014/08/19 10:41:33]

For being future-proof. I can remove this if you like, but it doesn't harm
either IMHO.

-  /** SOCKS4A */
-  SOCKS4A,
-  /** SOCKS5 */
-  SOCKS5,
+  HTTPS
 }