From 8f9ebabd221be90f2b7c10241f41b19e45711a1d Mon Sep 17 00:00:00 2001
From: Max Lv <max.c.lv@gmail.com>
Date: Tue, 28 May 2013 10:44:11 +0800
Subject: [PATCH] disable http proxy, no more need it

---
 src/main/res/xml/pref_feature.xml                       | 6 ------
 src/main/scala/com/github/shadowsocks/Shadowsocks.scala | 2 +-
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/main/res/xml/pref_feature.xml b/src/main/res/xml/pref_feature.xml
index a630256a..866d9046 100755
--- a/src/main/res/xml/pref_feature.xml
+++ b/src/main/res/xml/pref_feature.xml
@@ -1,12 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
 
-  <CheckBoxPreference
-      android:defaultValue="false"
-      android:key="isHTTPProxy"
-      android:summary="@string/http_proxy_summary"
-      android:title="@string/http_proxy">
-  </CheckBoxPreference>
   <CheckBoxPreference
       android:defaultValue="true"
       android:key="isDNSProxy"
diff --git a/src/main/scala/com/github/shadowsocks/Shadowsocks.scala b/src/main/scala/com/github/shadowsocks/Shadowsocks.scala
index ebd1f969..06232ae8 100644
--- a/src/main/scala/com/github/shadowsocks/Shadowsocks.scala
+++ b/src/main/scala/com/github/shadowsocks/Shadowsocks.scala
@@ -70,7 +70,7 @@ object Shadowsocks {
 
   val PREFS_NAME = "Shadowsocks"
   val PROXY_PREFS = Array("proxy", "remotePort", "port", "sitekey", "encMethod")
-  val FEATRUE_PREFS = Array("isHTTPProxy", "isDNSProxy", "isGFWList", "isGlobalProxy",
+  val FEATRUE_PREFS = Array("isDNSProxy", "isGFWList", "isGlobalProxy",
     "isBypassApps", "proxyedApps", "isAutoConnect")
   val TAG = "Shadowsocks"
   val REQUEST_CONNECT = 1