2.6.2 merge form googlecode

burnsra · Mar 24, 2012 · 1785216 · 1785216
1 parent 51a0b61
commit 1785216
Show file tree

Hide file tree

Showing 36 changed files with 396 additions and 91 deletions.
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.proxydroid"
-    android:versionCode="47"
-    android:versionName="2.6.1" >
+    android:versionCode="48"
+    android:versionName="2.6.2" >
 
     <uses-sdk
         android:minSdkVersion="7"

diff --git a/res/drawable-hdpi-v11/ic_stat_proxydroid.png b/res/drawable-hdpi-v11/ic_stat_proxydroid.png
diff --git a/res/drawable-hdpi-v9/ic_stat_proxydroid.png b/res/drawable-hdpi-v9/ic_stat_proxydroid.png
diff --git a/res/drawable-hdpi/ic_stat_proxydroid.png b/res/drawable-hdpi/ic_stat_proxydroid.png
diff --git a/res/drawable-ldpi-v11/ic_stat_proxydroid.png b/res/drawable-ldpi-v11/ic_stat_proxydroid.png
diff --git a/res/drawable-ldpi-v9/ic_stat_proxydroid.png b/res/drawable-ldpi-v9/ic_stat_proxydroid.png
diff --git a/res/drawable-ldpi/ic_stat_proxydroid.png b/res/drawable-ldpi/ic_stat_proxydroid.png
diff --git a/res/drawable-mdpi-v11/ic_stat_proxydroid.png b/res/drawable-mdpi-v11/ic_stat_proxydroid.png
diff --git a/res/drawable-mdpi-v9/ic_stat_proxydroid.png b/res/drawable-mdpi-v9/ic_stat_proxydroid.png
diff --git a/res/drawable-mdpi/ic_stat_proxydroid.png b/res/drawable-mdpi/ic_stat_proxydroid.png
diff --git a/res/drawable-xhdpi-v11/ic_stat_proxydroid.png b/res/drawable-xhdpi-v11/ic_stat_proxydroid.png
diff --git a/res/drawable-xhdpi-v9/ic_stat_proxydroid.png b/res/drawable-xhdpi-v9/ic_stat_proxydroid.png
diff --git a/res/drawable-xhdpi/ic_stat_proxydroid.png b/res/drawable-xhdpi/ic_stat_proxydroid.png
diff --git a/res/values/strings.xml b/res/values/strings.xml
@@ -132,12 +132,14 @@
     <array name="proxy_type_value">
         <item>http</item>
         <item>https</item>
+        <item>http-tunnel</item>
         <item>socks4</item>
         <item>socks5</item>
     </array>
     <array name="proxy_type_entry">
         <item>HTTP</item>
         <item>HTTPS</item>
+        <item>HTTP-Tunnel</item>
         <item>SOCKS4</item>
         <item>SOCKS5</item>
     </array>

diff --git a/res/xml-v14/proxydroid_preference.xml b/res/xml-v14/proxydroid_preference.xml
@@ -0,0 +1,139 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <PreferenceCategory android:title="@string/function_cat" >
+        <SwitchPreference
+            android:key="isRunning"
+            android:summary="@string/service_summary"
+            android:title="@string/service_controller" >
+        </SwitchPreference>
+
+        <ListPreference
+            android:key="profile"
+            android:title="@string/profile" >
+        </ListPreference>
+    </PreferenceCategory>
+    <PreferenceCategory android:title="@string/proxy_cat" >
+        <CheckBoxPreference
+            android:defaultValue="false"
+            android:key="isPAC"
+            android:summary="@string/pac_summary"
+            android:title="@string/pac" >
+        </CheckBoxPreference>
+
+        <EditTextPreference
+            android:key="host"
+            android:summary="@string/host_summary"
+            android:title="@string/host" >
+        </EditTextPreference>
+        <EditTextPreference
+            android:defaultValue="3128"
+            android:key="port"
+            android:summary="@string/port_summary"
+            android:title="@string/port" >
+        </EditTextPreference>
+
+        <ListPreference
+            android:defaultValue="http"
+            android:entries="@array/proxy_type_entry"
+            android:entryValues="@array/proxy_type_value"
+            android:key="proxyType"
+            android:title="@string/proxy_type" >
+        </ListPreference>
+
+        <CheckBoxPreference
+            android:key="isAutoConnect"
+            android:summary="@string/auto_connect_summary"
+            android:title="@string/auto_connect" >
+        </CheckBoxPreference>
+
+        <com.ksmaze.android.preference.ListPreferenceMultiSelect
+            android:defaultValue=""
+            android:dialogTitle="@string/ssid"
+            android:entries="@array/ssid_default_entries"
+            android:entryValues="@array/ssid_default_values"
+            android:key="ssid"
+            android:summary="@string/ssid_summary"
+            android:title="@string/ssid" />
+
+        <Preference
+            android:key="bypassAddrs"
+            android:summary="@string/set_bypass_summary"
+            android:title="@string/set_bypass" >
+        </Preference>
+    </PreferenceCategory>
+    <PreferenceCategory android:title="@string/user_cat" >
+        <CheckBoxPreference
+            android:defaultValue="false"
+            android:key="isAuth"
+            android:title="@string/auth" >
+        </CheckBoxPreference>
+
+        <EditTextPreference
+            android:key="user"
+            android:summary="@string/user_summary"
+            android:title="@string/user" >
+        </EditTextPreference>
+        <EditTextPreference
+            android:key="password"
+            android:password="true"
+            android:summary="@string/password_summary"
+            android:title="@string/password" >
+        </EditTextPreference>
+
+        <CheckBoxPreference
+            android:key="isNTLM"
+            android:summary="@string/ntlm_summary"
+            android:title="@string/ntlm" >
+        </CheckBoxPreference>
+
+        <EditTextPreference
+            android:key="domain"
+            android:summary="@string/domain_summary"
+            android:title="@string/domain" >
+        </EditTextPreference>
+    </PreferenceCategory>
+    <PreferenceCategory android:title="@string/fearute_cat" >
+        <CheckBoxPreference
+            android:defaultValue="true"
+            android:key="isAutoSetProxy"
+            android:summary="@string/auto_set_proxy_summary"
+            android:title="@string/auto_set_proxy" >
+        </CheckBoxPreference>
+
+        <Preference
+            android:key="proxyedApps"
+            android:summary="@string/proxyed_apps_summary"
+            android:title="@string/proxyed_apps" >
+        </Preference>
+
+        <CheckBoxPreference
+            android:defaultValue="false"
+            android:key="isBypassApps"
+            android:summary="@string/bypass_apps_summary"
+            android:title="@string/bypass_apps" >
+        </CheckBoxPreference>
+
+        <CheckBoxPreference
+            android:key="isDNSProxy"
+            android:summary="@string/dns_proxy_summary"
+            android:title="@string/dns_proxy" >
+        </CheckBoxPreference>
+    </PreferenceCategory>
+    <PreferenceCategory android:title="@string/notif_cat" >
+        <RingtonePreference
+            android:key="settings_key_notif_ringtone"
+            android:ringtoneType="notification"
+            android:showDefault="true"
+            android:showSilent="true"
+            android:summary="@string/notif_ringtone_summary"
+            android:title="@string/notif_ringtone_title" />
+
+        <CheckBoxPreference
+            android:defaultValue="true"
+            android:key="settings_key_notif_vibrate"
+            android:summary="@string/notif_vibrate_summary"
+            android:title="@string/notif_vibrate_title" />
+    </PreferenceCategory>
+
+</PreferenceScreen>
diff --git a/src/com/github/droidfu/http/BetterHttp.java b/src/com/github/droidfu/http/BetterHttp.java
diff --git a/src/com/github/droidfu/http/BetterHttpRequest.java b/src/com/github/droidfu/http/BetterHttpRequest.java
diff --git a/src/com/github/droidfu/http/BetterHttpRequestBase.java b/src/com/github/droidfu/http/BetterHttpRequestBase.java
diff --git a/src/com/github/droidfu/http/BetterHttpRequestRetryHandler.java b/src/com/github/droidfu/http/BetterHttpRequestRetryHandler.java
diff --git a/src/com/github/droidfu/http/BetterHttpResponse.java b/src/com/github/droidfu/http/BetterHttpResponse.java
diff --git a/src/com/github/droidfu/http/BetterHttpResponseImpl.java b/src/com/github/droidfu/http/BetterHttpResponseImpl.java
diff --git a/src/com/github/droidfu/http/HttpDelete.java b/src/com/github/droidfu/http/HttpDelete.java
diff --git a/src/com/github/droidfu/http/HttpGet.java b/src/com/github/droidfu/http/HttpGet.java
diff --git a/src/com/github/droidfu/http/HttpPost.java b/src/com/github/droidfu/http/HttpPost.java
diff --git a/src/com/github/droidfu/http/HttpPut.java b/src/com/github/droidfu/http/HttpPut.java
diff --git a/src/com/github/droidfu/http/ssl/EasySSLSocketFactory.java b/src/com/github/droidfu/http/ssl/EasySSLSocketFactory.java
diff --git a/src/com/github/droidfu/http/ssl/TrivialTrustManager.java b/src/com/github/droidfu/http/ssl/TrivialTrustManager.java
diff --git a/src/com/ksmaze/android/preference/ListPreferenceMultiSelect.java b/src/com/ksmaze/android/preference/ListPreferenceMultiSelect.java
diff --git a/src/org/proxydroid/BypassListActivity.java b/src/org/proxydroid/BypassListActivity.java
diff --git a/src/org/proxydroid/DomainValidator.java b/src/org/proxydroid/DomainValidator.java
diff --git a/src/org/proxydroid/Exec.java b/src/org/proxydroid/Exec.java
diff --git a/src/org/proxydroid/InnerSocketBuilder.java b/src/org/proxydroid/InnerSocketBuilder.java