Commit d73e955c authored by Max Lv's avatar Max Lv

update to 1.3.6

parent 836dc20b
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.github.shadowsocks" package="com.github.shadowsocks"
android:installLocation="auto" android:installLocation="auto"
android:versionCode="17" android:versionCode="18"
android:versionName="1.3.5"> android:versionName="1.3.6">
<uses-permission android:name="android.permission.INTERNET"/> <uses-permission android:name="android.permission.INTERNET"/>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
......
Subproject commit 3ed7551ce18147740ad1e1113d9d4ca2c01e4248 Subproject commit 7f69bc43b9fd02419dabca6c3a4a9b3fb2d0943d
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>com.github.shadowsocks</groupId> <groupId>com.github.shadowsocks</groupId>
<artifactId>shadowsocks</artifactId> <artifactId>shadowsocks</artifactId>
<version>1.3.5</version> <version>1.3.6</version>
<packaging>apk</packaging> <packaging>apk</packaging>
<name>Shadowsocks</name> <name>Shadowsocks</name>
......
...@@ -13,14 +13,14 @@ ...@@ -13,14 +13,14 @@
<PreferenceCategory android:title="@string/proxy_cat"> <PreferenceCategory android:title="@string/proxy_cat">
<EditTextPreference <EditTextPreference
android:dependency="isRunning" android:dependency="isRunning"
android:defaultValue="127.0.0.1" android:defaultValue="198.199.82.12"
android:key="proxy" android:key="proxy"
android:summary="@string/proxy_summary" android:summary="@string/proxy_summary"
android:title="@string/proxy"> android:title="@string/proxy">
</EditTextPreference> </EditTextPreference>
<EditTextPreference <EditTextPreference
android:dependency="isRunning" android:dependency="isRunning"
android:defaultValue="1984" android:defaultValue="443"
android:key="remotePort" android:key="remotePort"
android:summary="@string/remote_port_summary" android:summary="@string/remote_port_summary"
android:title="@string/remote_port"> android:title="@string/remote_port">
...@@ -34,14 +34,14 @@ ...@@ -34,14 +34,14 @@
</EditTextPreference> </EditTextPreference>
<EditTextPreference <EditTextPreference
android:dependency="isRunning" android:dependency="isRunning"
android:defaultValue="" android:defaultValue="u1rRWTssNv0p"
android:key="sitekey" android:key="sitekey"
android:summary="@string/sitekey_summary" android:summary="@string/sitekey_summary"
android:title="@string/sitekey"> android:title="@string/sitekey">
</EditTextPreference> </EditTextPreference>
<ListPreference <ListPreference
android:dependency="isRunning" android:dependency="isRunning"
android:defaultValue="table" android:defaultValue="rc4"
android:key="encMethod" android:key="encMethod"
android:entries="@array/enc_method_entry" android:entries="@array/enc_method_entry"
android:entryValues="@array/enc_method_value" android:entryValues="@array/enc_method_value"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment