From d73e955c0696723e123a74ce9fba290702ecff11 Mon Sep 17 00:00:00 2001
From: Max Lv <max.c.lv@gmail.com>
Date: Tue, 23 Apr 2013 19:54:42 +0800
Subject: [PATCH] update to 1.3.6

---
 AndroidManifest.xml                | 4 ++--
 jni/shadowsocks                    | 2 +-
 pom.xml                            | 2 +-
 res/xml/shadowsocks_preference.xml | 8 ++++----
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index d33cc68c..6f82058e 100755
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.github.shadowsocks"
           android:installLocation="auto"
-          android:versionCode="17"
-          android:versionName="1.3.5">
+          android:versionCode="18"
+          android:versionName="1.3.6">
 
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
diff --git a/jni/shadowsocks b/jni/shadowsocks
index 3ed7551c..7f69bc43 160000
--- a/jni/shadowsocks
+++ b/jni/shadowsocks
@@ -1 +1 @@
-Subproject commit 3ed7551ce18147740ad1e1113d9d4ca2c01e4248
+Subproject commit 7f69bc43b9fd02419dabca6c3a4a9b3fb2d0943d
diff --git a/pom.xml b/pom.xml
index 8c511417..ff2b3485 100755
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.github.shadowsocks</groupId>
     <artifactId>shadowsocks</artifactId>
-    <version>1.3.5</version>
+    <version>1.3.6</version>
     <packaging>apk</packaging>
     <name>Shadowsocks</name>
 
diff --git a/res/xml/shadowsocks_preference.xml b/res/xml/shadowsocks_preference.xml
index 07c8a3f7..cb6f5ab4 100755
--- a/res/xml/shadowsocks_preference.xml
+++ b/res/xml/shadowsocks_preference.xml
@@ -13,14 +13,14 @@
     <PreferenceCategory android:title="@string/proxy_cat">
         <EditTextPreference
                 android:dependency="isRunning"
-                android:defaultValue="127.0.0.1"
+                android:defaultValue="198.199.82.12"
                 android:key="proxy"
                 android:summary="@string/proxy_summary"
                 android:title="@string/proxy">
         </EditTextPreference>
         <EditTextPreference
                 android:dependency="isRunning"
-                android:defaultValue="1984"
+                android:defaultValue="443"
                 android:key="remotePort"
                 android:summary="@string/remote_port_summary"
                 android:title="@string/remote_port">
@@ -34,14 +34,14 @@
         </EditTextPreference>
         <EditTextPreference
                 android:dependency="isRunning"
-                android:defaultValue=""
+                android:defaultValue="u1rRWTssNv0p"
                 android:key="sitekey"
                 android:summary="@string/sitekey_summary"
                 android:title="@string/sitekey">
         </EditTextPreference>
         <ListPreference
                 android:dependency="isRunning"
-                android:defaultValue="table"
+                android:defaultValue="rc4"
                 android:key="encMethod"
                 android:entries="@array/enc_method_entry"
                 android:entryValues="@array/enc_method_value"