Update shadowsocks-libev

Fix russian translation
Migrate to preference support library
2016-09-23 12:26:38 +08:00 · 2016-09-23 00:44:02 +08:00 · 2016-09-23 00:30:39 +08:00 · 2016-09-22 21:18:02 +08:00 · 2016-09-22 20:38:33 +08:00 · 2016-09-22 20:16:22 +08:00
69 changed files with 4645 additions and 550 deletions
@@ -0,0 +1,18 @@
+Please answer these questions before submitting your issue. Thanks!
+
+### What version of Shadowsocks are you using?
+
+
+### What Android OS version and device are you using?
+
+
+### What did you do?
+
+
+### What did you expect to see?
+
+
+### What did you see instead?
+
+
+### What is your config in detail (with all sensitive info masked)?
@@ -15,6 +15,7 @@ gen_*
 *.o
 local.sbt
 .deps
+/proguard-sbt.txt

 #Intellij IDEA
 *.iml
@@ -30,3 +30,6 @@
 [submodule "src/main/jni/mbedtls"]
 	path = src/main/jni/mbedtls
 	url = https://github.com/ARMmbed/mbedtls
+[submodule "src/main/jni/pcre"]
+	path = src/main/jni/pcre
+	url = https://android.googlesource.com/platform/external/pcre
@@ -31,17 +31,18 @@ resolvers += Resolver.jcenterRepo
 useSupportVectors

 libraryDependencies ++= Seq(
-  "com.android.support" % "design" % "24.2.0",
-  "com.android.support" % "gridlayout-v7" % "24.2.0",
+  "com.android.support" % "design" % "24.2.1",
+  "com.android.support" % "gridlayout-v7" % "24.2.1",
+  "com.android.support" % "preference-v14" % "24.2.1",
  "com.github.clans" % "fab" % "1.6.4",
  "com.github.jorgecastilloprz" % "fabprogresscircle" % "1.01",
  "com.github.kevinsawicki" % "http-request" % "6.0",
-  "com.google.android.gms" % "play-services-ads" % "9.4.0",
-  "com.google.android.gms" % "play-services-analytics" % "9.4.0",
+  "com.google.android.gms" % "play-services-ads" % "9.6.0",
+  "com.google.android.gms" % "play-services-analytics" % "9.6.0",
  "com.j256.ormlite" % "ormlite-android" % "5.0",
  "com.twofortyfouram" % "android-plugin-api-for-locale" % "1.0.2",
  "dnsjava" % "dnsjava" % "2.1.7",
-  "eu.chainfire" % "libsuperuser" % "1.0.0.201607041850",
+  "eu.chainfire" % "libsuperuser" % "1.0.0.201608240809",
  "me.dm7.barcodescanner" % "zxing" % "1.9",
  "net.glxn.qrgen" % "android" % "2.0"
 )
@@ -52,6 +52,7 @@ pushd kcptun/client

 echo "Get dependences for kcptun"
 go get -u github.com/xtaci/kcp-go
+go get -u github.com/xtaci/smux
 go get

 echo "Cross compile kcptun for arm"
@@ -1,4 +1,4 @@
-addSbtPlugin("org.scala-android" % "sbt-android" % "1.6.15")
+addSbtPlugin("org.scala-android" % "sbt-android" % "1.6.18")

 addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.1.10")

@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
          xmlns:tools="http://schemas.android.com/tools" package="com.github.shadowsocks"
-          android:versionCode="150"
-          android:versionName="3.0.8">
+          android:versionCode="158"
+          android:versionName="3.1.6">

    <uses-permission android:name="android.permission.INTERNET"/>
    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
@@ -4,6 +4,7 @@ import com.github.shadowsocks.aidl.IShadowsocksServiceCallback;

 interface IShadowsocksService {
  int getState();
+  String getProfileName();

  oneway void registerCallback(IShadowsocksServiceCallback cb);
  oneway void unregisterCallback(IShadowsocksServiceCallback cb);
@@ -1,6 +1,6 @@
 package com.github.shadowsocks.aidl;

 interface IShadowsocksServiceCallback {
-  oneway void stateChanged(int state, String msg);
+  oneway void stateChanged(int state, String profileName, String msg);
  oneway void trafficUpdated(long txRate, long rxRate, long txTotal, long rxTotal);
 }
@@ -371,7 +371,9 @@ PDNSD_SOURCES  := $(wildcard $(LOCAL_PATH)/pdnsd/src/*.c)
 LOCAL_MODULE    := pdnsd
 LOCAL_SRC_FILES := $(PDNSD_SOURCES:$(LOCAL_PATH)/%=%)
 LOCAL_CFLAGS    := -DANDROID -Wall -O2 -I$(LOCAL_PATH)/pdnsd \
-				   -I$(LOCAL_PATH)/include/pdnsd
+				   -I$(LOCAL_PATH)/include/pdnsd -I$(LOCAL_PATH)/libancillary
+LOCAL_STATIC_LIBRARIES := libancillary
+LOCAL_LDLIBS := -llog

 include $(BUILD_EXECUTABLE)

@@ -381,25 +383,29 @@ include $(BUILD_EXECUTABLE)

 include $(CLEAR_VARS)

-SHADOWSOCKS_SOURCES := local.c cache.c udprelay.c encrypt.c utils.c netutils.c json.c jconf.c acl.c android.c
+SHADOWSOCKS_SOURCES := local.c cache.c udprelay.c encrypt.c \
+	utils.c netutils.c json.c jconf.c acl.c http.c tls.c rule.c \
+	android.c

 LOCAL_MODULE    := ss-local
 LOCAL_SRC_FILES := $(addprefix shadowsocks-libev/src/, $(SHADOWSOCKS_SOURCES))
 LOCAL_CFLAGS    := -Wall -O2 -fno-strict-aliasing -DMODULE_LOCAL \
 					-DUSE_CRYPTO_MBEDTLS -DANDROID -DHAVE_CONFIG_H \
 					-DCONNECT_IN_PROGRESS=EINPROGRESS \
+					-I$(LOCAL_PATH)/include/shadowsocks-libev \
 					-I$(LOCAL_PATH)/include \
 					-I$(LOCAL_PATH)/libancillary \
 					-I$(LOCAL_PATH)/mbedtls/include  \
+					-I$(LOCAL_PATH)/pcre \
 					-I$(LOCAL_PATH)/shadowsocks-libev/libudns \
 					-I$(LOCAL_PATH)/shadowsocks-libev/libcork/include \
 					-I$(LOCAL_PATH)/shadowsocks-libev/libsodium/src/libsodium/include \
 					-I$(LOCAL_PATH)/shadowsocks-libev/libsodium/src/libsodium/include/sodium \
 					-I$(LOCAL_PATH)/shadowsocks-libev/libipset/include \
-					-I$(LOCAL_PATH)/shadowsocks-libev/libev \
-					-I$(LOCAL_PATH)/include/shadowsocks-libev
+					-I$(LOCAL_PATH)/shadowsocks-libev/libev

-LOCAL_STATIC_LIBRARIES := libev libmbedtls libipset libcork libudns libsodium libancillary
+LOCAL_STATIC_LIBRARIES := libev libmbedtls libipset libcork libudns \
+	libsodium libancillary libpcre

 LOCAL_LDLIBS := -llog

@@ -551,15 +557,55 @@ include $(BUILD_EXECUTABLE)

 include $(CLEAR_VARS)

-LOCAL_MODULE:= mbedtls
+LOCAL_MODULE := mbedtls

-LOCAL_C_INCLUDES:= $(LOCAL_PATH)/mbedtls/include
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/mbedtls/include

-MBEDTLS_SOURCES  := $(wildcard $(LOCAL_PATH)/mbedtls/library/*.c)
+MBEDTLS_SOURCES := $(wildcard $(LOCAL_PATH)/mbedtls/library/*.c)

 LOCAL_SRC_FILES := $(MBEDTLS_SOURCES:$(LOCAL_PATH)/%=%)

 include $(BUILD_STATIC_LIBRARY)

+########################################################
+## pcre 
+########################################################
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := pcre 
+
+LOCAL_CFLAGS += -DHAVE_CONFIG_H
+
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/pcre/dist $(LOCAL_PATH)/pcre
+
+libpcre_src_files := \
+    pcre_chartables.c \
+    dist/pcre_byte_order.c \
+    dist/pcre_compile.c \
+    dist/pcre_config.c \
+    dist/pcre_dfa_exec.c \
+    dist/pcre_exec.c \
+    dist/pcre_fullinfo.c \
+    dist/pcre_get.c \
+    dist/pcre_globals.c \
+    dist/pcre_jit_compile.c \
+    dist/pcre_maketables.c \
+    dist/pcre_newline.c \
+    dist/pcre_ord2utf8.c \
+    dist/pcre_refcount.c \
+    dist/pcre_string_utils.c \
+    dist/pcre_study.c \
+    dist/pcre_tables.c \
+    dist/pcre_ucd.c \
+    dist/pcre_valid_utf8.c \
+    dist/pcre_version.c \
+    dist/pcre_xclass.c
+
+LOCAL_SRC_FILES := $(addprefix pcre/, $(libpcre_src_files))
+
+include $(BUILD_STATIC_LIBRARY)
+
 # Import cpufeatures
 $(call import-module,android/cpufeatures)
+
@@ -417,3 +417,9 @@

 /* Define as `fork' if `vfork' does not work. */
 /* #undef vfork */
+
+/* Define to 1 if you have the <pcre.h> header file. */
+#define HAVE_PCRE_H 1
+
+/* Define to 1 if you have the <pcre/pcre.h> header file. */
+/* #undef HAVE_PCRE_PCRE_H */
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ripple xmlns:android="http://schemas.android.com/apk/res/android" android:color="?android:colorControlHighlight">
    <item>
-        <color android:color="@color/material_accent_300"/>
+        <color android:color="@color/material_primary_300"/>
    </item>
 </ripple>
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<color xmlns:android="http://schemas.android.com/apk/res/android" android:color="@color/material_accent_300"/>
+<color xmlns:android="http://schemas.android.com/apk/res/android" android:color="@color/material_primary_300"/>
@@ -1,3 +1,4 @@
+<!--suppress NewApi -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
@@ -1,3 +1,4 @@
+<!--suppress NewApi -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
        android:width="24dp"
        android:height="24dp"
@@ -1,3 +1,4 @@
+<!--suppress NewApi -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
        android:width="24dp"
        android:height="24dp"
@@ -1,3 +1,4 @@
+<!--suppress NewApi -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
        android:width="24dp"
        android:height="24dp"
@@ -1,3 +1,4 @@
+<!--suppress NewApi -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
        android:width="24dp"
        android:height="24dp"
@@ -1,3 +1,4 @@
+<!--suppress NewApi -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
        android:width="24dp"
        android:height="24dp"
@@ -1,3 +1,4 @@
+<!--suppress NewApi -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
        android:width="24dp"
        android:height="24dp"
@@ -1,3 +1,4 @@
+<!--suppress NewApi -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
        android:width="24dp"
        android:height="24dp"
@@ -1,3 +1,4 @@
+<!--suppress NewApi -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
        android:width="24dp"
        android:height="24dp"
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--suppress NewApi -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
@@ -11,4 +12,4 @@
    <path
        android:fillColor="#fff"
        android:pathData="M 9.45 17.56 L 9.46 22 L 12.09 18.41 L 9.45 17.56 L 9.45 17.56 Z" />
-</vector>
+</vector>
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--suppress NewApi -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
@@ -11,4 +12,4 @@
    <path
        android:fillColor="#fff"
        android:pathData="M 9.45 17.56 L 12.09 18.41 L 9.46 22 L 9.45 17.56 Z" />
-</vector>
+</vector>
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--suppress NewApi -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
@@ -22,4 +23,4 @@
    <path
        android:fillColor="#fff"
        android:pathData="M8.56,8.56L0,12.8l6.83,2.57,4.64-3.9ZM6.44,13.08L5,12.55l5-2.47Z" />
-</vector>
+</vector>
@@ -17,8 +17,8 @@
            android:layout_gravity="bottom|end"
            android:layout_marginBottom="16dp"
            android:layout_marginEnd="16dp"
-            app:menu_colorNormal="@color/material_accent_500"
-            app:menu_colorPressed="@color/material_accent_700"
+            app:menu_colorNormal="@color/material_primary_500"
+            app:menu_colorPressed="@color/material_primary_700"
            app:fab_colorRipple="@android:color/white"
            app:layout_behavior="com.github.shadowsocks.widget.FloatingActionMenuBehavior">

@@ -26,8 +26,8 @@
                android:id="@+id/fab_manual_add"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
-                app:fab_colorNormal="@color/material_accent_500"
-                app:fab_colorPressed="@color/material_accent_700"
+                app:fab_colorNormal="@color/material_primary_500"
+                app:fab_colorPressed="@color/material_primary_700"
                app:fab_colorRipple="@android:color/white"
                app:fab_size="mini"
                app:fab_label="@string/add_profile_methods_manual_settings"
@@ -36,8 +36,8 @@
                android:id="@+id/fab_qrcode_add"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
-                app:fab_colorNormal="@color/material_accent_500"
-                app:fab_colorPressed="@color/material_accent_700"
+                app:fab_colorNormal="@color/material_primary_500"
+                app:fab_colorPressed="@color/material_primary_700"
                app:fab_colorRipple="@android:color/white"
                app:fab_size="mini"
                app:fab_label="@string/add_profile_methods_scan_qr_code"
@@ -46,8 +46,8 @@
                android:id="@+id/fab_nfc_add"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
-                app:fab_colorNormal="@color/material_accent_500"
-                app:fab_colorPressed="@color/material_accent_700"
+                app:fab_colorNormal="@color/material_primary_500"
+                app:fab_colorPressed="@color/material_primary_700"
                app:fab_colorRipple="@android:color/white"
                app:fab_size="mini"
                app:fab_label="NFC"
@@ -56,8 +56,8 @@
                android:id="@+id/fab_import_add"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
-                app:fab_colorNormal="@color/material_accent_500"
-                app:fab_colorPressed="@color/material_accent_700"
+                app:fab_colorNormal="@color/material_primary_500"
+                app:fab_colorPressed="@color/material_primary_700"
                app:fab_colorRipple="@android:color/white"
                app:fab_size="mini"
                app:fab_label="@string/action_import"
@@ -24,13 +24,9 @@
  <string name="proxy_cat">Настройки Сервера</string>
  <string name="profile_name">Имя Профиля</string>
  <string name="proxy">Сервер</string>
-  <string name="proxy_summary">Имя или IP удалённого сервера</string>
  <string name="remote_port">Удалённый порт</string>
-  <string name="remote_port_summary">%d (номер порта удалённого сервера)</string>
  <string name="port">Локальный порт</string>
-  <string name="port_summary">%d (номер порта локального сервера)</string>
  <string name="sitekey">Пароль</string>
-  <string name="sitekey_summary">Пароль удалённого сервера</string>
  <string name="enc_method">Метод Шифрования</string>

  <!-- feature category -->
@@ -46,6 +42,14 @@
  <string name="auto_set_gfwlist">CHN Маршрут</string>
  <string name="auto_set_gfwlist_summary">Игнорировать все сайты находящиеся в Китае</string>
  <string name="route_list">Маршрут</string>
+  <string-array name="route_entry">
+    <item>Все</item>
+    <item>Обход LAN</item>
+    <item>Обходной Китай</item>
+    <item>Обход LAN и Китай</item>
+    <item>Список GFW</item>
+    <item>Список Китай</item>
+  </string-array>
  <string name="proxied_apps">Прокси для выбранных приложений</string>
  <string name="proxied_apps_summary">Установить прокси для выбранных приложений, требует режим NAT под Android 4.x</string>
  <string name="on">Вкл</string>
@@ -141,5 +145,4 @@
  <string name="kcp_port">KCP порт</string>
  <string name="kcp_port_summary">%d (KCPTUN омер порта удалённого сервера)</string>
  <string name="kcpcli">KCP параметры</string>
-  <string name="kcpcli_summary">Командная строка KCPTUN</string>
 </resources>
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="Theme.Material" parent="Theme.MaterialBase"/>
+</resources>
@@ -9,13 +9,9 @@
  <string name="profile">配置文件</string>
  <string name="profile_summary">新建或切换到其他配置文件</string>
  <string name="proxy">服务器</string>
-  <string name="proxy_summary">远程服务器的地址</string>
  <string name="remote_port">远程端口</string>
-  <string name="remote_port_summary">%d（远程服务器的端口号）</string>
  <string name="port">本地端口</string>
-  <string name="port_summary">%d（本地客户端的端口号）</string>
  <string name="sitekey">密码</string>
-  <string name="sitekey_summary">远程服务器的密码</string>
  <string name="enc_method">加密方法</string>
  <string name="feature_cat">功能设置</string>
  <string name="http_proxy">HTTP 代理服务器</string>
@@ -110,6 +106,8 @@
    <item>绕过局域网地址</item>
    <item>绕过中国大陆地址</item>
    <item>绕过局域网及中国大陆地址</item>
+    <item>仅代理中国大陆无法访问的地址</item>
+    <item>仅代理中国大陆地址</item>
  </string-array>

  <string name="action_apply_all">应用设置到所有配置文件</string>
@@ -140,6 +138,5 @@
  <string name="kcp_port">KCP 端口</string>
  <string name="kcp_port_summary">%d（远端 KCPTUN 服务器的端口号）</string>
  <string name="kcpcli">KCP 参数</string>
-  <string name="kcpcli_summary">KCPTUN 的命令行参数</string>

 </resources>
@@ -10,13 +10,9 @@
  <string name="profile">設定檔</string>
  <string name="profile_summary">切換至其他設定檔或新增新設定檔</string>
  <string name="proxy">伺服器</string>
-  <string name="proxy_summary">遠端伺服器的 IP 位址或主機名稱</string>
  <string name="remote_port">遠端連接埠</string>
-  <string name="remote_port_summary">%d（遠端伺服器的連接埠號碼）</string>
  <string name="port">連接埠號碼</string>
-  <string name="port_summary">%d（本機伺服器的連接埠號碼）</string>
  <string name="sitekey">密碼</string>
-  <string name="sitekey_summary">遠端伺服器的密碼</string>
  <string name="enc_method">加密方法</string>
  <string name="feature_cat">功能設定</string>
  <string name="http_proxy">HTTP Proxy</string>
@@ -112,6 +108,8 @@
    <item>略過區域網路位址</item>
    <item>略過中國大陸位址</item>
    <item>略過區域網路及中國大陸位址</item>
+    <item>僅代理大陸屏蔽位址</item>
+    <item>僅代理大陸位址</item>
  </string-array>

  <string name="action_apply_all">應用設置到所有配置文件</string>
@@ -142,6 +140,5 @@
  <string name="kcp_port">KCP 連接埠</string>
  <string name="kcp_port_summary">%d（遠端 KCPTUN 伺服器的連接埠號碼）</string>
  <string name="kcpcli">KCP 參數</string>
-  <string name="kcpcli_summary">KCPTUN 的命令行參數</string>

 </resources>
@@ -38,18 +38,13 @@
        <item>chacha20-ietf</item>
    </string-array>

-    <string-array name="route_entry">
-        <item>All</item>
-        <item>Bypass LAN</item>
-        <item>Bypass China</item>
-        <item>Bypass LAN &amp; China</item>
-    </string-array>
-
    <string-array name="route_value">
        <item>all</item>
        <item>bypass-lan</item>
        <item>bypass-china</item>
        <item>bypass-lan-china</item>
+        <item>gfwlist</item>
+        <item>china-list</item>
    </string-array>

    <string-array name="private_route">
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <declare-styleable name="DropDownPreference">
-        <attr name="android:entries" />
-        <attr name="android:entryValues" />
-    </declare-styleable>
    <declare-styleable name="NumberPickerPreference">
        <attr name="max" format="integer" />
        <attr name="min" format="integer" />
@@ -6,8 +6,9 @@
  <color name="material_blue_grey_300">#90A4AE</color>
  <color name="material_blue_grey_500">#607D8B</color>
  <color name="material_blue_grey_700">#455A64</color>
-  <color name="material_accent_300">@color/material_blue_grey_300</color>
-  <color name="material_accent_500">@color/material_blue_grey_500</color>
-  <color name="material_accent_700">@color/material_blue_grey_700</color>
+  <color name="material_primary_300">@color/material_blue_grey_300</color>
+  <color name="material_primary_500">@color/material_blue_grey_500</color>
+  <color name="material_primary_700">@color/material_blue_grey_700</color>
+  <color name="material_accent_200">@color/material_blue_grey_500</color>

 </resources>
@@ -29,13 +29,9 @@
  <string name="proxy_cat">Server Settings</string>
  <string name="profile_name">Profile Name</string>
  <string name="proxy">Server</string>
-  <string name="proxy_summary">Hostname or IP of the remote server</string>
  <string name="remote_port">Remote Port</string>
-  <string name="remote_port_summary">%d (port number of the remote server)</string>
  <string name="port">Local Port</string>
-  <string name="port_summary">%d (port number of the local server)</string>
  <string name="sitekey">Password</string>
-  <string name="sitekey_summary">Password of the remote server</string>
  <string name="enc_method">Encrypt Method</string>

  <!-- feature category -->
@@ -52,6 +48,14 @@
  <string name="auto_set_gfwlist_summary">Bypass all sites located in China
  </string>
  <string name="route_list">Route</string>
+  <string-array name="route_entry">
+    <item>All</item>
+    <item>Bypass LAN</item>
+    <item>Bypass China</item>
+    <item>Bypass LAN &amp; China</item>
+    <item>GFW List</item>
+    <item>China List</item>
+  </string-array>
  <string name="proxied_apps">Per-App Proxy</string>
  <string name="proxied_apps_summary">Set proxy for selected apps, requires NAT mode under Android 4.x</string>
  <string name="on">On</string>
@@ -147,5 +151,4 @@
  <string name="kcp_port">KCP Port</string>
  <string name="kcp_port_summary">%d (port number of the remote KCPTUN server)</string>
  <string name="kcpcli">KCP Parameters (CLI)</string>
-  <string name="kcpcli_summary">The command line of KCPTUN</string>
 </resources>
@@ -6,19 +6,43 @@
        <item name="android:textSize">24sp</item>
    </style>

-    <style name="Theme.Material" parent="Theme.AppCompat.Light.NoActionBar">
-        <item name="android:navigationBarColor">@color/material_accent_700</item>
-        <item name="colorAccent">@color/material_accent_500</item>
-        <item name="colorButtonNormal">@color/material_accent_500</item>
-        <item name="colorPrimary">@color/material_accent_500</item>
-        <item name="colorPrimaryDark">@color/material_accent_700</item>
+    <style name="Theme.MaterialBase" parent="Theme.AppCompat.Light.NoActionBar">
+        <!--suppress NewApi -->
+        <item name="android:navigationBarColor">@color/material_primary_700</item>
+        <item name="colorAccent">@color/material_primary_500</item>
+        <item name="colorButtonNormal">@color/material_primary_500</item>
+        <item name="colorPrimary">@color/material_primary_500</item>
+        <item name="colorPrimaryDark">@color/material_primary_700</item>
+        <item name="preferenceTheme">@style/Theme.Material.PreferenceThemeOverlay</item>
    </style>

    <style name="Theme.Material.Dialog" parent="Theme.AppCompat.Light.Dialog">
-        <item name="colorAccent">@color/material_accent_500</item>
-        <item name="colorPrimary">@color/material_accent_500</item>
-        <item name="colorPrimaryDark">@color/material_accent_700</item>
+        <item name="colorAccent">@color/material_primary_500</item>
+        <item name="colorButtonNormal">@color/material_accent_200</item>
+        <item name="colorPrimary">@color/material_primary_500</item>
+        <item name="colorPrimaryDark">@color/material_primary_700</item>
+        <item name="preferenceTheme">@style/Theme.Material.PreferenceThemeOverlay</item>
        <item name="windowNoTitle">true</item>
    </style>

+    <!-- Fix for wrong padding on v17-v20 based on: https://github.com/Gericop/Android-Support-Preference-V7-Fix/blob/a6082cb/preference-v7/src/main/res/values-v17/styles.xml -->
+    <style name="Theme.Material" parent="Theme.MaterialBase">
+        <item name="android:listPreferredItemPaddingStart">16dp</item>
+        <item name="android:listPreferredItemPaddingEnd">16dp</item>
+    </style>
+    <!-- This is needed because the default PreferenceCategory appearance doesn't use bold text style -->
+    <style name="Preference_TextAppearanceMaterialBody2">
+        <item name="android:textSize">14sp</item>
+        <item name="android:fontFamily">sans-serif-medium</item>
+        <item name="android:textStyle">bold</item>
+        <item name="android:textColor">?android:attr/textColorPrimary</item>
+    </style>
+    <style name="Theme.Material.PreferenceThemeOverlay" parent="@style/PreferenceThemeOverlay.v14.Material">
+        <item name="preferenceFragmentListStyle">@style/Theme.Material.PreferenceFragmentList</item>
+    </style>
+    <style name="Theme.Material.PreferenceFragmentList" parent="@style/PreferenceFragmentList.Material">
+        <item name="android:fadeScrollbars">true</item>
+        <item name="android:scrollbars">vertical</item>
+    </style>
+
 </resources>
@@ -2,39 +2,40 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
                  xmlns:app="http://schemas.android.com/apk/res/com.github.shadowsocks">

-    <PreferenceCategory
+    <tk.mygod.preference.PreferenceCategory
            android:title="@string/proxy_cat">

-        <com.github.shadowsocks.preferences.SummaryEditTextPreference
+        <tk.mygod.preference.EditTextPreference
                android:key="profileName"
                android:persistent="false"
+                android:summary="%s"
                android:title="@string/profile_name"/>
-        <com.github.shadowsocks.preferences.SummaryEditTextPreference
+        <tk.mygod.preference.EditTextPreference
                android:key="proxy"
                android:persistent="false"
-                android:summary="@string/proxy_summary"
+                android:summary="%s"
                android:title="@string/proxy"/>
-        <com.github.shadowsocks.preferences.NumberPickerPreference
+        <tk.mygod.preference.NumberPickerPreference
                app:min="1"
                app:max="65535"
                android:key="remotePortNum"
                android:persistent="false"
-                android:summary="@string/remote_port_summary"
+                android:summary="%d"
                android:title="@string/remote_port"/>
-        <com.github.shadowsocks.preferences.NumberPickerPreference
+        <tk.mygod.preference.NumberPickerPreference
                app:min="1025"
                app:max="65535"
                android:key="localPortNum"
                android:persistent="false"
-                android:summary="@string/port_summary"
+                android:summary="%d"
                android:title="@string/port"/>
-        <com.github.shadowsocks.preferences.PasswordEditTextPreference
+        <tk.mygod.preference.EditTextPreference
                android:inputType="textPassword"
                android:key="sitekey"
                android:persistent="false"
-                android:summary="@string/sitekey_summary"
+                android:summary="%s"
                android:title="@string/sitekey"/>
-        <com.github.shadowsocks.preferences.DropDownPreference
+        <android.support.v7.preference.DropDownPreference
                android:key="encMethod"
                android:persistent="false"
                android:entries="@array/enc_method_entry"
@@ -47,12 +48,12 @@
                android:summary="@string/onetime_auth_summary"
                android:title="@string/onetime_auth"/>

-    </PreferenceCategory>
+    </tk.mygod.preference.PreferenceCategory>

-    <PreferenceCategory
+    <tk.mygod.preference.PreferenceCategory
            android:title="@string/feature_cat">

-        <com.github.shadowsocks.preferences.DropDownPreference
+        <android.support.v7.preference.DropDownPreference
                android:key="route"
                android:persistent="false"
                android:entries="@array/route_entry"
@@ -75,9 +76,9 @@
                android:summary="@string/udp_dns_summary"
                android:title="@string/udp_dns"/>

-    </PreferenceCategory>
+    </tk.mygod.preference.PreferenceCategory>

-    <PreferenceCategory
+    <tk.mygod.preference.PreferenceCategory
            android:title="@string/kcp">

        <SwitchPreference
@@ -86,7 +87,7 @@
                android:summary="@string/kcp_summary"
                android:title="@string/kcp"/>

-        <com.github.shadowsocks.preferences.NumberPickerPreference
+        <tk.mygod.preference.NumberPickerPreference
                app:min="1"
                app:max="65535"
                android:key="kcpPort"
@@ -94,15 +95,15 @@
                android:summary="@string/kcp_port_summary"
                android:title="@string/kcp_port"/>

-        <com.github.shadowsocks.preferences.KcpCliPreference
+        <tk.mygod.preference.EditTextPreference
                android:key="kcpcli"
                android:persistent="false"
-                android:summary="@string/kcpcli_summary"
+                android:summary="%s"
                android:title="@string/kcpcli"/>

-    </PreferenceCategory>
+    </tk.mygod.preference.PreferenceCategory>

-    <PreferenceCategory android:title="@string/misc_cat">
+    <tk.mygod.preference.PreferenceCategory android:title="@string/misc_cat">

        <SwitchPreference
                android:key="isAutoConnect"
@@ -125,7 +126,7 @@
                    android:summary="@string/flush_dnscache_summary"/>
        <Preference android:key="about" android:title="@string/about"/>

-    </PreferenceCategory>
+    </tk.mygod.preference.PreferenceCategory>


 </PreferenceScreen>
@@ -46,14 +46,13 @@ import android.content._
 import android.content.pm.PackageManager
 import android.graphics.drawable.Drawable
 import android.os.{Bundle, Handler}
-import android.preference.PreferenceManager
 import android.support.v7.app.AppCompatActivity
 import android.support.v7.widget.Toolbar.OnMenuItemClickListener
 import android.support.v7.widget.{DefaultItemAnimator, LinearLayoutManager, RecyclerView, Toolbar}
 import android.view._
 import android.widget._
-import com.github.shadowsocks.utils.{Key, Utils}
 import com.github.shadowsocks.ShadowsocksApplication.app
+import com.github.shadowsocks.utils.{Key, Utils}

 import scala.collection.JavaConversions._
 import scala.collection.mutable
@@ -143,7 +142,7 @@ class AppManager extends AppCompatActivity with OnMenuItemClickListener {
  private var loadingView: View = _
  private val appsLoading = new AtomicBoolean
  private var handler: Handler = _
-  private val profile = app.currentProfile.get
+  private val profile = app.currentProfile.orNull

  private def initProxiedApps(str: String = profile.individual) = proxiedApps = str.split('\n').to[mutable.HashSet]

@@ -213,6 +212,8 @@ class AppManager extends AppCompatActivity with OnMenuItemClickListener {
  protected override def onCreate(savedInstanceState: Bundle) {
    super.onCreate(savedInstanceState)

+    if (profile == null) finish()
+
    handler = new Handler()

    this.setContentView(R.layout.layout_apps)
@@ -69,6 +69,7 @@ trait BaseService extends Service {
  final val callbacks = new RemoteCallbackList[IShadowsocksServiceCallback]
  var callbacksCount: Int = _
  lazy val handler = new Handler(getMainLooper)
+  lazy val restartHanlder = new Handler(getMainLooper)

  private val closeReceiver: BroadcastReceiver = (context: Context, intent: Intent) => {
    Toast.makeText(context, R.string.stopping, Toast.LENGTH_SHORT).show()
@@ -82,7 +83,10 @@ trait BaseService extends Service {
   val activeNetwork = cm.getActiveNetworkInfo()
   val isConnected = activeNetwork != null && activeNetwork.isConnected()

-   if (isConnected && profile.kcp && kcptunProcess != null) kcptunProcess.restart()
+   if (isConnected && profile.kcp && kcptunProcess != null) {
+     restartHanlder.removeCallbacks(null)
+     restartHanlder.postDelayed(() => kcptunProcess.restart(), 2000)
+   }
  }
  var networkReceiverRegistered: Boolean = _

@@ -91,6 +95,8 @@ trait BaseService extends Service {
      state
    }

+    override def getProfileName: String = if (profile == null) null else profile.name
+
    override def unregisterCallback(cb: IShadowsocksServiceCallback) {
      if (cb != null && callbacks.unregister(cb)) {
        callbacksCount -= 1
@@ -282,7 +288,7 @@ trait BaseService extends Service {
        val n = callbacks.beginBroadcast()
        for (i <- 0 until n) {
          try {
-            callbacks.getBroadcastItem(i).stateChanged(s, msg)
+            callbacks.getBroadcastItem(i).stateChanged(s, binder.getProfileName, msg)
          } catch {
            case _: Exception => // Ignore
          }
@@ -53,5 +53,7 @@ object BootReceiver {
 }

 class BootReceiver extends BroadcastReceiver {
-  def onReceive(context: Context, intent: Intent) = Utils.startSsService(context)
+  def onReceive(context: Context, intent: Intent) = {
+    Utils.startSsService(context)
+  }
 }
@@ -97,14 +97,17 @@ class GuardedProcess(cmd: Seq[String]) {
          semaphore.release
          process.waitFor

-          if (isRestart) {
-            isRestart = false
-          } else {
-            if (currentTimeMillis - startTime < 1000) {
-              Log.w(TAG, "process exit too fast, stop guard: " + cmd)
-              isDestroyed = true
+          this.synchronized {
+            if (isRestart) {
+              isRestart = false
+            } else {
+              if (currentTimeMillis - startTime < 1000) {
+                Log.w(TAG, "process exit too fast, stop guard: " + cmd)
+                isDestroyed = true
+              }
            }
          }
+
        }
      } catch {
        case ignored: InterruptedException =>
@@ -134,8 +137,10 @@ class GuardedProcess(cmd: Seq[String]) {
  }

  def restart() {
-    isRestart = true
-    process.destroy()
+    this.synchronized {
+      isRestart = true
+      process.destroy()
+    }
  }

  @throws(classOf[InterruptedException])
@@ -235,7 +235,7 @@ final class ProfileManagerActivity extends AppCompatActivity with OnMenuItemClic
    }).attachToRecyclerView(profilesList)

    attachService(new IShadowsocksServiceCallback.Stub {
-      def stateChanged(state: Int, msg: String) = () // ignore
+      def stateChanged(state: Int, profileName: String, msg: String) = () // ignore
      def trafficUpdated(txRate: Long, rxRate: Long, txTotal: Long, rxTotal: Long) =
        if (selectedItem != null) selectedItem.updateText(txTotal, rxTotal)
    })
@@ -276,7 +276,7 @@ final class ProfileManagerActivity extends AppCompatActivity with OnMenuItemClic
    updateNfcState()
  }

-  override def onNewIntent(intent: Intent): Unit ={
+  override def onNewIntent(intent: Intent) {
    super.onNewIntent(intent)
    handleShareIntent(intent)
  }
@@ -59,11 +59,11 @@ import android.util.Log
 import android.view.{View, ViewGroup}
 import android.widget._
 import com.github.jorgecastilloprz.FABProgressCircle
+import com.github.shadowsocks.ShadowsocksApplication.app
 import com.github.shadowsocks.aidl.IShadowsocksServiceCallback
 import com.github.shadowsocks.database._
 import com.github.shadowsocks.utils.CloseUtils._
 import com.github.shadowsocks.utils._
-import com.github.shadowsocks.ShadowsocksApplication.app
 import com.google.android.gms.ads.{AdRequest, AdSize, AdView}
 import eu.chainfire.libsuperuser.Shell

@@ -111,7 +111,7 @@ class Shadowsocks extends AppCompatActivity with ServiceBoundContext {

  // Services
  private val callback = new IShadowsocksServiceCallback.Stub {
-    def stateChanged(s: Int, m: String) {
+    def stateChanged(s: Int, profileName: String, m: String) {
      handler.post(() => {
        s match {
          case State.CONNECTING =>
@@ -186,8 +186,8 @@ class Shadowsocks extends AppCompatActivity with ServiceBoundContext {
      snackbar.show
    }

-    if (!app.settings.getBoolean(BuildConfig.VERSION_NAME, false)) {
-      app.editor.putBoolean(BuildConfig.VERSION_NAME, true).apply()
+    if (app.settings.getInt(Key.currentVersionCode, -1) != BuildConfig.VERSION_CODE) {
+      app.editor.putInt(Key.currentVersionCode, BuildConfig.VERSION_CODE).apply()

      recovery()

@@ -514,6 +514,7 @@ class Shadowsocks extends AppCompatActivity with ServiceBoundContext {
    crashRecovery()

    copyAssets(System.getABI)
+    copyAssets("acl")

    val ab = new ArrayBuffer[String]
    for (executable <- EXECUTABLES) {
@@ -89,7 +89,7 @@ class ShadowsocksApplication extends Application {
  }

  override def onCreate() {
-    java.lang.System.setProperty(LocalLog.LOCAL_LOG_LEVEL_PROPERTY, "ERROR")
+    if (!BuildConfig.DEBUG) java.lang.System.setProperty(LocalLog.LOCAL_LOG_LEVEL_PROPERTY, "ERROR")
    app = this
    AppCompatDelegate.setCompatVectorFromResourcesEnabled(true)
    val tm = TagManager.getInstance(this)
@@ -112,7 +112,7 @@ class ShadowsocksApplication extends Application {
    }
    pending.setResultCallback(callback, 2, TimeUnit.SECONDS)

-    TcpFastOpen.enabled(settings.getBoolean(Key.tfo, false))
+    TcpFastOpen.enabled(settings.getBoolean(Key.tfo, TcpFastOpen.sendEnabled))
  }

  def refreshContainerHolder {
@@ -71,15 +71,17 @@ class ShadowsocksNatService extends BaseService {
  var su: Shell.Interactive = _

  def startShadowsocksDaemon() {
-    if (profile.route != Route.ALL) {
-      val acl: Array[Array[String]] = profile.route match {
-        case Route.BYPASS_LAN => Array(getResources.getStringArray(R.array.private_route))
-        case Route.BYPASS_CHN => Array(getResources.getStringArray(R.array.chn_route))
+    if (profile.route != Route.ALL && profile.route != Route.GFWLIST) {
+      val acl: Array[String] = profile.route match {
+        case Route.BYPASS_LAN => getResources.getStringArray(R.array.private_route)
+        case Route.BYPASS_CHN => getResources.getStringArray(R.array.chn_route)
        case Route.BYPASS_LAN_CHN =>
-          Array(getResources.getStringArray(R.array.private_route), getResources.getStringArray(R.array.chn_route))
+          getResources.getStringArray(R.array.private_route) ++ getResources.getStringArray(R.array.chn_route)
+        case Route.CHINALIST =>
+          Array("[bypass_all]", "[white_list]") ++ getResources.getStringArray(R.array.chn_route)
      }
      Utils.printToFile(new File(getApplicationInfo.dataDir + "/acl.list"))(p => {
-        acl.flatten.foreach(p.println)
+        acl.foreach(p.println)
      })
    }

@@ -108,7 +110,10 @@ class ShadowsocksNatService extends BaseService {

    if (profile.route != Route.ALL) {
      cmd += "--acl"
-      cmd += (getApplicationInfo.dataDir + "/acl.list")
+      if (profile.route == Route.GFWLIST)
+        cmd += (getApplicationInfo.dataDir + "/gfwlist.acl")
+      else
+        cmd += (getApplicationInfo.dataDir + "/acl.list")
    }

    if (BuildConfig.DEBUG) Log.d(TAG, cmd.mkString(" "))
@@ -184,12 +189,23 @@ class ShadowsocksNatService extends BaseService {

  def startDnsDaemon() {

-    val conf = if (profile.route == Route.BYPASS_CHN || profile.route == Route.BYPASS_LAN_CHN) {
-      ConfigUtils.PDNSD_DIRECT.formatLocal(Locale.ENGLISH, getApplicationInfo.dataDir,
-        "127.0.0.1", profile.localPort + 53, getBlackList, profile.localPort + 63, "")
-    } else {
-      ConfigUtils.PDNSD_LOCAL.formatLocal(Locale.ENGLISH, getApplicationInfo.dataDir,
-        "127.0.0.1", profile.localPort + 53, profile.localPort + 63, "")
+    val conf = profile.route match {
+      case Route.BYPASS_CHN | Route.BYPASS_LAN_CHN => {
+        ConfigUtils.PDNSD_DIRECT.formatLocal(Locale.ENGLISH, getApplicationInfo.dataDir,
+          "127.0.0.1", profile.localPort + 53, getBlackList, "", profile.localPort + 63, "")
+      }
+      case Route.GFWLIST => {
+        ConfigUtils.PDNSD_UDP.formatLocal(Locale.ENGLISH, getApplicationInfo.dataDir,
+          "127.0.0.1", profile.localPort + 53, "1.2.4.8, 208.67.222.222", "", profile.localPort + 63, "")
+      }
+      case Route.CHINALIST => {
+        ConfigUtils.PDNSD_UDP.formatLocal(Locale.ENGLISH, getApplicationInfo.dataDir,
+          "127.0.0.1", profile.localPort + 53, "8.8.8.8, 208.67.222.222", "", profile.localPort + 63, "")
+      }
+      case _ => {
+        ConfigUtils.PDNSD_LOCAL.formatLocal(Locale.ENGLISH, getApplicationInfo.dataDir,
+          "127.0.0.1", profile.localPort + 53, profile.localPort + 63, "")
+      }
    }

    Utils.printToFile(new File(getApplicationInfo.dataDir + "/pdnsd-nat.conf"))(p => {
@@ -298,23 +314,15 @@ class ShadowsocksNatService extends BaseService {
    su.addCommand((init_sb ++ http_sb).toArray)
  }

-  override def startRunner(profile: Profile) = if (su == null) {
+  override def startRunner(profile: Profile) = if (su == null)
    su = new Shell.Builder().useSU().setWantSTDERR(true).setWatchdogTimeout(10).open((_, exitCode, _) =>
      if (exitCode == 0) super.startRunner(profile) else {
        if (su != null) {
-          Log.wtf(TAG, "libsuperuser#55 has been fixed. Please remove the redundant code.")
          su.close()
          su = null
        }
        super.stopRunner(true, getString(R.string.nat_no_root))
      })
-    su.waitForIdle()
-    if (!su.isRunning) {
-      su.close()
-      su = null
-      super.stopRunner(true, getString(R.string.nat_no_root))
-    }
-  }

  override def connect() {
    super.connect()
@@ -19,7 +19,7 @@ class ShadowsocksNotification(private val service: BaseService, profileName: Str
  private val keyGuard = service.getSystemService(Context.KEYGUARD_SERVICE).asInstanceOf[KeyguardManager]
  private lazy val nm = service.getSystemService(Context.NOTIFICATION_SERVICE).asInstanceOf[NotificationManager]
  private lazy val callback = new Stub {
-    override def stateChanged(state: Int, msg: String) = () // ignore
+    override def stateChanged(state: Int, profileName: String, msg: String) = ()  // ignore
    override def trafficUpdated(txRate: Long, rxRate: Long, txTotal: Long, rxTotal: Long) {
      val txr = TrafficMonitor.formatTraffic(txRate)
      val rxr = TrafficMonitor.formatTraffic(rxRate)
@@ -34,7 +34,7 @@ class ShadowsocksNotification(private val service: BaseService, profileName: Str

  private val builder = new NotificationCompat.Builder(service)
    .setWhen(0)
-    .setColor(ContextCompat.getColor(service, R.color.material_accent_500))
+    .setColor(ContextCompat.getColor(service, R.color.material_primary_500))
    .setTicker(service.getString(R.string.forward_success))
    .setContentTitle(profileName)
    .setContentIntent(PendingIntent.getActivity(service, 0, new Intent(service, classOf[Shadowsocks])
@@ -6,14 +6,16 @@ import android.content.SharedPreferences.OnSharedPreferenceChangeListener
 import android.content.{Intent, SharedPreferences}
 import android.net.Uri
 import android.os.Bundle
-import android.preference.{Preference, PreferenceFragment, SwitchPreference}
 import android.support.design.widget.Snackbar
+import android.support.v14.preference.SwitchPreference
 import android.support.v7.app.AlertDialog
+import android.support.v7.preference.{DropDownPreference, Preference}
 import android.webkit.{WebView, WebViewClient}
 import com.github.shadowsocks.ShadowsocksApplication.app
 import com.github.shadowsocks.database.Profile
-import com.github.shadowsocks.preferences._
+import com.github.shadowsocks.preferences.KcpCliPreferenceDialogFragment
 import com.github.shadowsocks.utils.{Key, TcpFastOpen, Utils}
+import tk.mygod.preference._

 object ShadowsocksSettings {
  // Constants
@@ -27,31 +29,25 @@ object ShadowsocksSettings {
    pref.asInstanceOf[DropDownPreference].setValue(value)
  }

-  def updatePasswordEditTextPreference(pref: Preference, value: String) {
-    pref.setSummary(value)
-    pref.asInstanceOf[PasswordEditTextPreference].setText(value)
+  def updateEditTextPreference(pref: Preference, value: String) {
+    pref.asInstanceOf[EditTextPreference].setText(value)
  }

  def updateNumberPickerPreference(pref: Preference, value: Int) {
    pref.asInstanceOf[NumberPickerPreference].setValue(value)
  }

-  def updateSummaryEditTextPreference(pref: Preference, value: String) {
-    pref.setSummary(value)
-    pref.asInstanceOf[SummaryEditTextPreference].setText(value)
-  }
-
  def updateSwitchPreference(pref: Preference, value: Boolean) {
    pref.asInstanceOf[SwitchPreference].setChecked(value)
  }

  def updatePreference(pref: Preference, name: String, profile: Profile) {
    name match {
-      case Key.name => updateSummaryEditTextPreference(pref, profile.name)
-      case Key.host => updateSummaryEditTextPreference(pref, profile.host)
+      case Key.name => updateEditTextPreference(pref, profile.name)
+      case Key.host => updateEditTextPreference(pref, profile.host)
      case Key.remotePort => updateNumberPickerPreference(pref, profile.remotePort)
      case Key.localPort => updateNumberPickerPreference(pref, profile.localPort)
-      case Key.password => updatePasswordEditTextPreference(pref, profile.password)
+      case Key.password => updateEditTextPreference(pref, profile.password)
      case Key.method => updateDropDownPreference(pref, profile.method)
      case Key.route => updateDropDownPreference(pref, profile.route)
      case Key.proxyApps => updateSwitchPreference(pref, profile.proxyApps)
@@ -60,7 +56,7 @@ object ShadowsocksSettings {
      case Key.ipv6 => updateSwitchPreference(pref, profile.ipv6)
      case Key.kcp => updateSwitchPreference(pref, profile.kcp)
      case Key.kcpPort => updateNumberPickerPreference(pref, profile.kcpPort)
-      case Key.kcpcli => updateSummaryEditTextPreference(pref, profile.kcpcli)
+      case Key.kcpcli => updateEditTextPreference(pref, profile.kcpcli)
    }
  }
 }
@@ -73,8 +69,7 @@ class ShadowsocksSettings extends PreferenceFragment with OnSharedPreferenceChan

  private var isProxyApps: SwitchPreference = _

-  override def onCreate(savedInstanceState: Bundle) {
-    super.onCreate(savedInstanceState)
+  override def onCreatePreferences(bundle: Bundle, key: String) {
    addPreferencesFromResource(R.xml.pref_all)
    getPreferenceManager.getSharedPreferences.registerOnSharedPreferenceChangeListener(this)

@@ -206,8 +201,29 @@ class ShadowsocksSettings extends PreferenceFragment with OnSharedPreferenceChan
    })
  }

+  override def onDisplayPreferenceDialog(preference: Preference) = preference match {
+    case _: EditTextPreference => displayPreferenceDialog(preference.getKey,
+      if (preference.getKey == Key.kcpcli) new KcpCliPreferenceDialogFragment()
+      else new EditTextPreferenceDialogFragment())
+    case _: NumberPickerPreference =>
+      displayPreferenceDialog(preference.getKey, new NumberPickerPreferenceDialogFragment())
+    case _ => super.onDisplayPreferenceDialog(preference)
+  }
+
  def refreshProfile() {
-    profile = app.currentProfile.get
+    profile = app.currentProfile match {
+      case Some(p) => p
+      case None =>
+        app.profileManager.getFirstProfile match {
+          case Some(p) =>
+            app.profileId(p.id)
+            p
+          case None =>
+            val default = app.profileManager.createDefault()
+            app.profileId(default.id)
+            default
+        }
+    }
    isProxyApps.setChecked(profile.proxyApps)
  }

@@ -5,7 +5,6 @@ import android.graphics.drawable.Icon
 import android.service.quicksettings.{Tile, TileService}
 import com.github.shadowsocks.aidl.IShadowsocksServiceCallback
 import com.github.shadowsocks.utils.{State, Utils}
-import com.github.shadowsocks.ShadowsocksApplication.app

 /**
  * @author Mygod
@@ -23,7 +22,7 @@ final class ShadowsocksTileService extends TileService with ServiceBoundContext
  private lazy val iconConnected = Icon.createWithResource(this, R.drawable.ic_start_connected)
  private lazy val callback = new IShadowsocksServiceCallback.Stub {
    def trafficUpdated(txRate: Long, rxRate: Long, txTotal: Long, rxTotal: Long) = ()
-    def stateChanged(state: Int, msg: String) {
+    def stateChanged(state: Int, profileName: String, msg: String) {
      val tile = getQsTile
      if (tile != null) {
        state match {
@@ -33,10 +32,7 @@ final class ShadowsocksTileService extends TileService with ServiceBoundContext
            tile.setState(Tile.STATE_INACTIVE)
          case State.CONNECTED =>
            tile.setIcon(iconConnected)
-            tile.setLabel(app.currentProfile match {
-              case Some(profile) => profile.name
-              case None => getString(R.string.app_name)
-            })
+            tile.setLabel(if (profileName == null) getString(R.string.app_name) else profileName)
            tile.setState(Tile.STATE_ACTIVE)
          case _ =>
            tile.setIcon(iconBusy)
@@ -48,7 +44,7 @@ final class ShadowsocksTileService extends TileService with ServiceBoundContext
    }
  }

-  override def onServiceConnected() = callback.stateChanged(bgService.getState, null)
+  override def onServiceConnected() = callback.stateChanged(bgService.getState, bgService.getProfileName, null)

  override def onCreate {
    super.onCreate
@@ -42,6 +42,7 @@ package com.github.shadowsocks
 import java.io.File
 import java.util.Locale

+import android.annotation.SuppressLint
 import android.content._
 import android.content.pm.PackageManager.NameNotFoundException
 import android.net.VpnService
@@ -225,15 +226,17 @@ class ShadowsocksVpnService extends VpnService with BaseService {
  }

  def startShadowsocksDaemon() {
-    if (profile.route != Route.ALL) {
-      val acl: Array[Array[String]] = profile.route match {
-        case Route.BYPASS_LAN => Array(getResources.getStringArray(R.array.private_route))
-        case Route.BYPASS_CHN => Array(getResources.getStringArray(R.array.chn_route))
+    if (profile.route != Route.ALL && profile.route != Route.GFWLIST) {
+      val acl: Array[String] = profile.route match {
+        case Route.BYPASS_LAN => getResources.getStringArray(R.array.private_route)
+        case Route.BYPASS_CHN => getResources.getStringArray(R.array.chn_route)
        case Route.BYPASS_LAN_CHN =>
-          Array(getResources.getStringArray(R.array.private_route), getResources.getStringArray(R.array.chn_route))
+          getResources.getStringArray(R.array.private_route) ++ getResources.getStringArray(R.array.chn_route)
+        case Route.CHINALIST =>
+          Array("[bypass_all]", "[white_list]") ++ getResources.getStringArray(R.array.chn_route)
      }
      Utils.printToFile(new File(getApplicationInfo.dataDir + "/acl.list"))(p => {
-        acl.flatten.foreach(p.println)
+        acl.foreach(p.println)
      })
    }

@@ -262,7 +265,10 @@ class ShadowsocksVpnService extends VpnService with BaseService {

    if (profile.route != Route.ALL) {
      cmd += "--acl"
-      cmd += (getApplicationInfo.dataDir + "/acl.list")
+      if (profile.route == Route.GFWLIST)
+        cmd += (getApplicationInfo.dataDir + "/gfwlist.acl")
+      else
+        cmd += (getApplicationInfo.dataDir + "/acl.list")
    }

    if (TcpFastOpen.sendEnabled) cmd += "--fast-open"
@@ -287,6 +293,7 @@ class ShadowsocksVpnService extends VpnService with BaseService {
    })
    val cmd = ArrayBuffer[String](getApplicationInfo.dataDir + "/ss-tunnel"
      , "-V"
+      , "-u"
      , "-t", "10"
      , "-b", "127.0.0.1"
      , "-L", "8.8.8.8:53"
@@ -302,11 +309,20 @@ class ShadowsocksVpnService extends VpnService with BaseService {

  def startDnsDaemon() {
    val ipv6 = if (profile.ipv6) "" else "reject = ::/0;"
-    val conf = {
-      if (profile.route == Route.BYPASS_CHN || profile.route == Route.BYPASS_LAN_CHN) {
+    val conf = profile.route match {
+      case Route.BYPASS_CHN | Route.BYPASS_LAN_CHN => {
        ConfigUtils.PDNSD_DIRECT.formatLocal(Locale.ENGLISH, getApplicationInfo.dataDir,
-          "0.0.0.0", profile.localPort + 53, getBlackList, profile.localPort + 63, ipv6)
-      } else {
+          "0.0.0.0", profile.localPort + 53, getBlackList, ipv6, profile.localPort + 63, ipv6)
+      }
+      case Route.GFWLIST => {
+        ConfigUtils.PDNSD_UDP.formatLocal(Locale.ENGLISH, getApplicationInfo.dataDir,
+          "0.0.0.0", profile.localPort + 53, "1.2.4.8, 208.67.222.222", ipv6, profile.localPort + 63, ipv6)
+      }
+      case Route.CHINALIST => {
+        ConfigUtils.PDNSD_UDP.formatLocal(Locale.ENGLISH, getApplicationInfo.dataDir,
+          "0.0.0.0", profile.localPort + 53, "8.8.8.8, 208.67.222.222", ipv6, profile.localPort + 63, ipv6)
+      }
+      case _ => {
        ConfigUtils.PDNSD_LOCAL.formatLocal(Locale.ENGLISH, getApplicationInfo.dataDir,
          "0.0.0.0", profile.localPort + 53, profile.localPort + 63, ipv6)
      }
@@ -321,6 +337,7 @@ class ShadowsocksVpnService extends VpnService with BaseService {
    pdnsdProcess = new GuardedProcess(cmd).start()
  }

+  @SuppressLint(Array("NewApi"))
  def startVpn(): Int = {

    val builder = new Builder()
@@ -328,7 +345,8 @@ class ShadowsocksVpnService extends VpnService with BaseService {
      .setSession(profile.name)
      .setMtu(VPN_MTU)
      .addAddress(PRIVATE_VLAN.formatLocal(Locale.ENGLISH, "1"), 24)
-      .addDnsServer("8.8.8.8")
+
+    builder.addDnsServer("8.8.8.8")

    if (profile.ipv6) {
      builder.addAddress(PRIVATE_VLAN6.formatLocal(Locale.ENGLISH, "1"), 126)
@@ -41,6 +41,7 @@ package com.github.shadowsocks.database

 import java.util.Locale

+import android.os.Binder
 import android.util.Base64
 import com.j256.ormlite.field.{DataType, DatabaseField}

@@ -54,8 +55,9 @@ class Profile {
  @DatabaseField
  var host: String = ""

+  // hopefully hashCode = mHandle doesn't change, currently this is true from KitKat to Nougat
  @DatabaseField
-  var localPort: Int = 1080
+  var localPort: Int = 1080 + Binder.getCallingUserHandle.hashCode

  @DatabaseField
  var remotePort: Int = 8388
@@ -1,169 +0,0 @@
-package com.github.shadowsocks.preferences
-
-import android.content.Context
-import android.content.res.TypedArray
-import android.preference.Preference
-import android.support.annotation.{ArrayRes, NonNull}
-import android.support.v7.widget.AppCompatSpinner
-import android.util.AttributeSet
-import android.view.{View, ViewGroup}
-import android.widget.AdapterView.OnItemSelectedListener
-import android.widget.{AdapterView, ArrayAdapter}
-import com.github.shadowsocks.R
-
-/**
-  * @author Mygod
-  */
-final class DropDownPreference(private val mContext: Context, attrs: AttributeSet = null)
-  extends Preference(mContext, attrs) with SummaryPreference {
-
-  private val mAdapter = new ArrayAdapter[String](mContext, android.R.layout.simple_spinner_dropdown_item)
-  private val mSpinner = new AppCompatSpinner(mContext)
-  private var mEntries: Array[CharSequence] = _
-  private var mEntryValues: Array[CharSequence] = _
-  private var mSelectedIndex: Int = -1
-
-  mSpinner.setVisibility(View.INVISIBLE)
-  mSpinner.setAdapter(mAdapter)
-  mSpinner.setOnItemSelectedListener(new OnItemSelectedListener {
-    def onNothingSelected(parent: AdapterView[_]) { }
-    def onItemSelected(parent: AdapterView[_], view: View, position: Int, id: Long) = {
-      val value = getValue(position)
-      if (position != mSelectedIndex && callChangeListener(value)) setValue(position, value)
-    }
-  })
-  setOnPreferenceClickListener((preference: Preference) => {
-    // TODO: not working with scrolling
-    // mSpinner.setDropDownVerticalOffset(Utils.dpToPx(getContext, -48 * mSelectedIndex).toInt)
-    mSpinner.performClick
-    true
-  })
-  val a: TypedArray = mContext.obtainStyledAttributes(attrs, R.styleable.DropDownPreference)
-  setEntries(a.getTextArray(R.styleable.DropDownPreference_android_entries))
-  setEntryValues(a.getTextArray(R.styleable.DropDownPreference_android_entryValues))
-  a.recycle
-
-  protected override def getSummaryValue = getEntry
-
-  /**
-    * Sets the human-readable entries to be shown in the list. This will be shown in subsequent dialogs.
-    *
-    * Each entry must have a corresponding index in [[setEntryValues(CharSequence[])]].
-    *
-    * @param entries The entries.
-    * @see [[setEntryValues(CharSequence[])]]
-    */
-  def setEntries(entries: Array[CharSequence]) {
-    mEntries = entries
-    mAdapter.clear
-    if (entries != null) for (entry <- entries) mAdapter.add(entry.toString)
-  }
-  /**
-    * @see #setEntries(CharSequence[])
-    * @param entriesResId The entries array as a resource.
-    */
-  def setEntries(@ArrayRes entriesResId: Int): Unit = setEntries(getContext.getResources.getTextArray(entriesResId))
-  /**
-    * The list of entries to be shown in the list in subsequent dialogs.
-    *
-    * @return The list as an array.
-    */
-  def getEntries = mEntries
-
-  /**
-    * The array to find the value to save for a preference when an entry from
-    * entries is selected. If a user clicks on the second item in entries, the
-    * second item in this array will be saved to the preference.
-    *
-    * @param entryValues The array to be used as values to save for the preference.
-    */
-  def setEntryValues(entryValues: Array[CharSequence]) = mEntryValues = entryValues
-  /**
-    * @see #setEntryValues(CharSequence[])
-    * @param entryValuesResId The entry values array as a resource.
-    */
-  def setEntryValues(@ArrayRes entryValuesResId: Int): Unit =
-    setEntryValues(getContext.getResources.getTextArray(entryValuesResId))
-  /**
-    * Returns the array of values to be saved for the preference.
-    *
-    * @return The array of values.
-    */
-  def getEntryValues: Array[CharSequence] = mEntryValues
-
-  private def getValue(index: Int) = (if (mEntryValues == null) index else mEntryValues(index)).toString
-  /**
-    * Sets the value of the key. This should be one of the entries in [[getEntryValues]].
-    *
-    * @param value The value to set for the key.
-    */
-  def setValue(value: String): Unit = setValue(findIndexOfValue(value), value)
-
-  /**
-    * Sets the value to the given index from the entry values.
-    *
-    * @param index The index of the value to set.
-    */
-  def setValueIndex(index: Int) = setValue(index, getValue(index))
-
-  private def setValue(index: Int, value: String) {
-    persistString(value)
-    mSelectedIndex = index
-    mSpinner.setSelection(index)
-    notifyChanged
-  }
-
-  /**
-    * Returns the value of the key. This should be one of the entries in [[getEntryValues]].
-    *
-    * @return The value of the key.
-    */
-  def getValue = if (mEntryValues == null || mSelectedIndex < 0) null else mEntryValues(mSelectedIndex).toString
-
-  /**
-    * Returns the entry corresponding to the current value.
-    *
-    * @return The entry corresponding to the current value, or null.
-    */
-  def getEntry = {
-    val index = getValueIndex
-    if (index >= 0 && mEntries != null) mEntries(index) else null
-  }
-
-  /**
-    * Returns the index of the given value (in the entry values array).
-    *
-    * @param value The value whose index should be returned.
-    * @return The index of the value, or -1 if not found.
-    */
-  def findIndexOfValue(value: String): Int = {
-    if (value != null && mEntryValues != null) {
-      var i = mEntryValues.length - 1
-      while (i >= 0) {
-        if (mEntryValues(i) == value) return i
-        i -= 1
-      }
-    }
-    -1
-  }
-
-  def getValueIndex = mSelectedIndex
-
-  protected override def onGetDefaultValue(a: TypedArray, index: Int) = a.getString(index)
-  protected override def onSetInitialValue (restoreValue: Boolean, defaultValue: AnyRef) =
-    setValue(if (restoreValue) getPersistedString(getValue) else defaultValue.asInstanceOf[String])
-
-  def setDropDownWidth(dimenResId: Int) =
-    mSpinner.setDropDownWidth(mContext.getResources.getDimensionPixelSize(dimenResId))
-
-  protected override def onBindView(@NonNull view: View) {
-    super.onBindView(view)
-    val parent = mSpinner.getParent.asInstanceOf[ViewGroup]
-    if (view eq parent) return
-    if (parent != null) parent.removeView(mSpinner)
-    view.asInstanceOf[ViewGroup].addView(mSpinner, 0)
-    val lp = mSpinner.getLayoutParams
-    lp.width = 0
-    mSpinner.setLayoutParams(lp)
-  }
-}
@@ -1,21 +1,22 @@
 package com.github.shadowsocks.preferences

 import android.app.AlertDialog
-import android.content.{Context, DialogInterface}
-import android.util.AttributeSet
+import android.content.DialogInterface
 import eu.chainfire.libsuperuser.Shell
+import tk.mygod.preference.EditTextPreferenceDialogFragment

-import scala.collection.JavaConversions._
+import scala.collection.JavaConverters._

 /**
  * @author Mygod
  */
-class KcpCliPreference(context: Context, attrs: AttributeSet) extends SummaryEditTextPreference(context, attrs) {
+class KcpCliPreferenceDialogFragment extends EditTextPreferenceDialogFragment {
  override def onPrepareDialogBuilder(builder: AlertDialog.Builder) {
    super.onPrepareDialogBuilder(builder)
-    builder.setNeutralButton("?", ((_, _) => new AlertDialog.Builder(context)
+    builder.setNeutralButton("?", ((_, _) => new AlertDialog.Builder(builder.getContext)
      .setTitle("?")
-      .setMessage(asScalaBuffer(Shell.SH.run(context.getApplicationInfo.dataDir + "/kcptun --help"))
+      .setMessage(Shell.SH.run(builder.getContext.getApplicationInfo.dataDir + "/kcptun --help")
+        .asScala
        .dropWhile(line => line != "GLOBAL OPTIONS:")
        .drop(1)
        .takeWhile(line => line.length() > 3)
@@ -1,68 +0,0 @@
-/*
- * Shadowsocks - A shadowsocks client for Android
- * Copyright (C) 2013 <max.c.lv@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- *
- *                            ___====-_  _-====___
- *                      _--^^^#####//      \\#####^^^--_
- *                   _-^##########// (    ) \\##########^-_
- *                  -############//  |\^^/|  \\############-
- *                _/############//   (@::@)   \\############\_
- *               /#############((     \\//     ))#############\
- *              -###############\\    (oo)    //###############-
- *             -#################\\  / VV \  //#################-
- *            -###################\\/      \//###################-
- *           _#/|##########/\######(   /\   )######/\##########|\#_
- *           |/ |#/\#/\#/\/  \#/\##\  |  |  /##/\#/  \/\#/\#/\#| \|
- *           `  |/  V  V  `   V  \#\| |  | |/#/  V   '  V  V  \|  '
- *              `   `  `      `   / | |  | | \   '      '  '   '
- *                               (  | |  | |  )
- *                              __\ | |  | | /__
- *                             (vvv(VVV)(VVV)vvv)
- *
- *                              HERE BE DRAGONS
- *
- */
-
-package com.github.shadowsocks.preferences
-
-import android.content.Context
-import android.preference.EditTextPreference
-import android.util.AttributeSet
-
-class PasswordEditTextPreference(context: Context, attrs: AttributeSet, defStyle: Int)
-  extends EditTextPreference(context, attrs, defStyle) {
-
-  def this(context: Context, attrs: AttributeSet) = {
-    this(context, attrs, android.R.attr.editTextPreferenceStyle)
-    mDefaultSummary = getSummary
-  }
-
-  override def setText(text: String) {
-    super.setText(text)
-    setSummary(text)
-  }
-
-  override def setSummary(summary: CharSequence) {
-    if (summary.toString.isEmpty) {
-      super.setSummary(mDefaultSummary)
-    } else {
-      super.setSummary(summary.toString.map(c => "*").mkString)
-    }
-  }
-
-  private var mDefaultSummary: CharSequence = getSummary
-}
@@ -1,69 +0,0 @@
-/*
- * Shadowsocks - A shadowsocks client for Android
- * Copyright (C) 2013 <max.c.lv@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- *
- *                            ___====-_  _-====___
- *                      _--^^^#####//      \\#####^^^--_
- *                   _-^##########// (    ) \\##########^-_
- *                  -############//  |\^^/|  \\############-
- *                _/############//   (@::@)   \\############\_
- *               /#############((     \\//     ))#############\
- *              -###############\\    (oo)    //###############-
- *             -#################\\  / VV \  //#################-
- *            -###################\\/      \//###################-
- *           _#/|##########/\######(   /\   )######/\##########|\#_
- *           |/ |#/\#/\#/\/  \#/\##\  |  |  /##/\#/  \/\#/\#/\#| \|
- *           `  |/  V  V  `   V  \#\| |  | |/#/  V   '  V  V  \|  '
- *              `   `  `      `   / | |  | | \   '      '  '   '
- *                               (  | |  | |  )
- *                              __\ | |  | | /__
- *                             (vvv(VVV)(VVV)vvv)
- *
- *                              HERE BE DRAGONS
- *
- */
-
-package com.github.shadowsocks.preferences
-
-import android.content.Context
-import android.preference.EditTextPreference
-import android.text.TextUtils
-import android.util.AttributeSet
-
-class SummaryEditTextPreference(context: Context, attrs: AttributeSet, defStyle: Int)
-  extends EditTextPreference(context, attrs, defStyle) {
-
-  def this(context: Context, attrs: AttributeSet) = {
-    this(context, attrs, android.R.attr.editTextPreferenceStyle)
-    mDefaultSummary = getSummary
-  }
-
-  override def setText(text: String) {
-    super.setText(text)
-    setSummary(text)
-  }
-
-  override def setSummary(summary: CharSequence) {
-    if (TextUtils.isEmpty(summary)) {
-      super.setSummary(mDefaultSummary)
-    } else {
-      super.setSummary(summary)
-    }
-  }
-
-  private var mDefaultSummary: CharSequence = getSummary
-}
@@ -1,21 +0,0 @@
-package com.github.shadowsocks.preferences
-
-import java.util.Locale
-
-import android.preference.Preference
-
-/**
-  * Make your preference support %s in summary. Override getSummaryValue to customize what to put in.
-  * @author Mygod
-  */
-trait SummaryPreference extends Preference {
-  protected def getSummaryValue: AnyRef
-
-  /**
-    * Returns the summary of this SummaryPreference. If the summary has a String formatting marker in it
-    * (i.e. "%s" or "%1$s"), then the current entry value will be substituted in its place.
-    *
-    * @return the summary with appropriate string substitution
-    */
-  override def getSummary = super.getSummary.toString.formatLocal(Locale.ENGLISH, getSummaryValue)
-}
@@ -116,12 +116,59 @@ object ConfigUtils {
      |
      |server {
      | label = "china-servers";
-      | ip = 114.114.114.114, 112.124.47.27;
+      | ip = 1.2.4.8, 208.67.222.222, 114.114.114.114;
      | timeout = 4;
      | exclude = %s;
      | policy = included;
      | uptest = none;
      | preset = on;
+      | %s
+      | reject_policy = negate;
+      | reject_recursively = on;
+      |}
+      |
+      |server {
+      | label = "local-server";
+      | ip = 127.0.0.1;
+      | port = %d;
+      | %s
+      | reject_policy = negate;
+      | reject_recursively = on;
+      |}
+      |
+      |rr {
+      | name=localhost;
+      | reverse=on;
+      | a=127.0.0.1;
+      | owner=localhost;
+      | soa=localhost,root.localhost,42,86400,900,86400,86400;
+      |}
+    """.stripMargin
+
+  val PDNSD_UDP =
+    """
+      |global {
+      | perm_cache = 2048;
+      | cache_dir = "%s";
+      | server_ip = %s;
+      | server_port = %d;
+      | query_method = udp_tcp;
+      | run_ipv4 = on;
+      | min_ttl = 15m;
+      | max_ttl = 1w;
+      | timeout = 10;
+      | daemon = off;
+      |}
+      |
+      |server {
+      | label = "remote-servers";
+      | ip = %s;
+      | timeout = 5;
+      | uptest = none;
+      | preset = on;
+      | %s
+      | reject_policy = negate;
+      | reject_recursively = on;
      |}
      |
      |server {
@@ -173,6 +220,7 @@ object Key {
  val kcpcli = "kcpcli"

  val tfo = "tcp_fastopen"
+  val currentVersionCode = "currentVersionCode"
 }

 object State {
@@ -194,4 +242,6 @@ object Route {
  val BYPASS_LAN = "bypass-lan"
  val BYPASS_CHN = "bypass-china"
  val BYPASS_LAN_CHN = "bypass-lan-china"
+  val GFWLIST = "gfwlist"
+  val CHINALIST = "china-list"
 }
@@ -259,7 +259,7 @@ object Utils {
  }

  def startSsService(context: Context) {
-    val isInstalled: Boolean = app.settings.getBoolean(BuildConfig.VERSION_NAME, false)
+    val isInstalled = app.settings.getInt(Key.currentVersionCode, -1) == BuildConfig.VERSION_CODE
    if (!isInstalled) return

    val intent = new Intent(context, classOf[ShadowsocksRunnerService])
@@ -0,0 +1,32 @@
+package tk.mygod.preference
+
+import android.content.Context
+import android.support.v7.preference.{EditTextPreference => Parent}
+import android.support.v7.widget.AppCompatEditText
+import android.text.InputType
+import android.util.AttributeSet
+
+/**
+  * Fixed EditTextPreference + SummaryPreference with password support!
+  * Based on: https://github.com/Gericop/Android-Support-Preference-V7-Fix/tree/master/app/src/main/java/android/support/v7/preference
+  */
+class EditTextPreference(context: Context, attrs: AttributeSet = null) extends Parent(context, attrs)
+  with SummaryPreference {
+  val editText = new AppCompatEditText(context, attrs)
+  editText.setId(android.R.id.edit)
+
+  override protected def getSummaryValue = {
+    var text = getText
+    if (text == null) text = ""
+    val inputType = editText.getInputType
+    if (inputType == (InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD) ||
+      inputType == (InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_WEB_PASSWORD) ||
+      inputType == (InputType.TYPE_CLASS_NUMBER | InputType.TYPE_NUMBER_VARIATION_PASSWORD))
+      "\u2022" * text.length else text
+  }
+
+  override def setText(text: String) = {
+    super.setText(text)
+    notifyChanged
+  }
+}
@@ -0,0 +1,30 @@
+package tk.mygod.preference
+
+import android.content.Context
+import android.support.v14.preference.PreferenceDialogFragment
+import android.view.{View, ViewGroup}
+
+class EditTextPreferenceDialogFragment extends PreferenceDialogFragment {
+  private lazy val preference = getPreference.asInstanceOf[EditTextPreference]
+  private lazy val editText = preference.editText
+
+  override protected def onCreateDialogView(context: Context) = {
+    val parent = editText.getParent.asInstanceOf[ViewGroup]
+    if (parent != null) parent.removeView(editText)
+    editText
+  }
+
+  override protected def onBindDialogView(view: View) {
+    super.onBindDialogView(view)
+    editText.setText(preference.getText)
+    val text = editText.getText
+    if (text != null) editText.setSelection(0, text.length)
+  }
+
+  override protected def needInputMethod = true
+
+  def onDialogClosed(positiveResult: Boolean) = if (positiveResult) {
+    val value = editText.getText.toString
+    if (preference.callChangeListener(value)) preference.setText(value)
+  }
+}
@@ -1,20 +1,15 @@
-package com.github.shadowsocks.preferences
+package tk.mygod.preference

 import android.content.Context
 import android.content.res.TypedArray
-import android.os.Bundle
-import android.preference.DialogPreference
+import android.support.v7.preference.DialogPreference
 import android.util.AttributeSet
-import android.view.{ViewGroup, WindowManager}
 import android.widget.NumberPicker
 import com.github.shadowsocks.R

-/**
-  * @author Mygod
-  */
-final class NumberPickerPreference(context: Context, attrs: AttributeSet = null)
+class NumberPickerPreference(private val context: Context, attrs: AttributeSet = null)
  extends DialogPreference(context, attrs) with SummaryPreference {
-  private val picker = new NumberPicker(context)
+  private[preference] val picker = new NumberPicker(context)
  private var value: Int = _

  {
@@ -28,7 +23,7 @@ final class NumberPickerPreference(context: Context, attrs: AttributeSet = null)
  def getMin = if (picker == null) 0 else picker.getMinValue
  def getMax = picker.getMaxValue
  def setValue(i: Int) {
-    if (i == getValue) return
+    if (i == value) return
    picker.setValue(i)
    value = picker.getValue
    persistInt(value)
@@ -37,28 +32,8 @@ final class NumberPickerPreference(context: Context, attrs: AttributeSet = null)
  def setMin(value: Int) = picker.setMinValue(value)
  def setMax(value: Int) = picker.setMaxValue(value)

-  override protected def showDialog(state: Bundle) {
-    super.showDialog(state)
-    getDialog.getWindow.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE)
-  }
-  override protected def onCreateDialogView = {
-    val parent = picker.getParent.asInstanceOf[ViewGroup]
-    if (parent != null) parent.removeView(picker)
-    picker
-  }
-  override protected def onDialogClosed(positiveResult: Boolean) {
-    picker.clearFocus // commit changes
-    super.onDialogClosed(positiveResult)  // forward compatibility
-    if (positiveResult) {
-      val value = picker.getValue
-      if (callChangeListener(value)) {
-        setValue(value)
-        return
-      }
-    }
-    picker.setValue(value)
-  }
-  override protected def onGetDefaultValue(a: TypedArray, index: Int) = a.getInt(index, getMin).asInstanceOf[AnyRef]
+  override protected def onGetDefaultValue(a: TypedArray, index: Int): AnyRef =
+    a.getInt(index, getMin).asInstanceOf[AnyRef]
  override protected def onSetInitialValue(restorePersistedValue: Boolean, defaultValue: Any) {
    val default = defaultValue.asInstanceOf[Int]
    setValue(if (restorePersistedValue) getPersistedInt(default) else default)
@@ -0,0 +1,36 @@
+package tk.mygod.preference
+
+import android.content.Context
+import android.support.v14.preference.PreferenceDialogFragment
+import android.view.inputmethod.InputMethodManager
+import android.view.{View, ViewGroup}
+
+class NumberPickerPreferenceDialogFragment extends PreferenceDialogFragment {
+  private lazy val preference = getPreference.asInstanceOf[NumberPickerPreference]
+  private lazy val picker = preference.picker
+  private lazy val inputMethodManager =
+    getActivity.getSystemService(Context.INPUT_METHOD_SERVICE).asInstanceOf[InputMethodManager]
+
+  override protected def onCreateDialogView(context: Context) = {
+    val parent = picker.getParent.asInstanceOf[ViewGroup]
+    if (parent != null) parent.removeView(picker)
+    picker
+  }
+
+  override protected def onBindDialogView(view: View) {
+    super.onBindDialogView(view)
+    picker.setValue(preference.getValue)
+  }
+
+  override protected def needInputMethod = true
+
+  def onDialogClosed(positiveResult: Boolean) {
+    picker.clearFocus // commit changes
+    if (positiveResult) {
+      val value = picker.getValue
+      if (preference.callChangeListener(value)) preference.setValue(value)
+    }
+    inputMethodManager.hideSoftInputFromWindow(getActivity.getCurrentFocus.getWindowToken,
+      InputMethodManager.HIDE_NOT_ALWAYS)
+  }
+}
@@ -0,0 +1,18 @@
+package tk.mygod.preference
+
+import android.content.Context
+import android.support.v7.preference.{PreferenceViewHolder, PreferenceCategory => Base}
+import android.util.AttributeSet
+import android.view.ViewGroup.MarginLayoutParams
+
+/**
+  * Based on: https://github.com/Gericop/Android-Support-Preference-V7-Fix/blob/4c2bb2896895dbedb37b659b36bd2a96b33c1605/preference-v7/src/main/java/com/takisoft/fix/support/v7/preference/PreferenceCategory.java
+  *
+  * @author Mygod
+  */
+class PreferenceCategory(context: Context, attrs: AttributeSet = null) extends Base(context, attrs) {
+  override def onBindViewHolder(holder: PreferenceViewHolder) {
+    super.onBindViewHolder(holder)
+    holder.findViewById(android.R.id.title).getLayoutParams.asInstanceOf[MarginLayoutParams].bottomMargin = 0
+  }
+}
@@ -0,0 +1,27 @@
+package tk.mygod.preference
+
+import android.app.DialogFragment
+import android.os.Bundle
+import android.support.v14.preference.{PreferenceFragment => Base}
+import android.support.v7.preference.PreferenceScreen
+import android.view.{LayoutInflater, ViewGroup}
+
+abstract class PreferenceFragment extends Base {
+  override def onCreateView(inflater: LayoutInflater, container: ViewGroup, savedInstanceState: Bundle) =
+    super.onCreateView(inflater, container, savedInstanceState)
+
+  protected final def displayPreferenceDialog(key: String, fragment: DialogFragment) {
+    val bundle = new Bundle(1)
+    bundle.putString("key", key)
+    fragment.setArguments(bundle)
+    fragment.setTargetFragment(this, 0)
+    fragment.show(getFragmentManager, "android.support.v14.preference.PreferenceFragment.DIALOG")
+  }
+
+  override protected def onCreateAdapter(screen: PreferenceScreen) = new PreferenceGroupAdapter(screen)
+
+  override def onResume {
+    super.onResume
+    getListView.scrollBy(0, 0)
+  }
+}
@@ -0,0 +1,65 @@
+package tk.mygod.preference
+
+import java.lang.reflect.Field
+import java.util.List
+
+import android.os.Build
+import android.support.v4.content.ContextCompat
+import android.support.v4.view.ViewCompat
+import android.support.v7.preference.{PreferenceGroup, PreferenceViewHolder, PreferenceGroupAdapter => Old}
+import android.view.{LayoutInflater, View, ViewGroup}
+import com.github.shadowsocks.R
+
+/**
+  * Fix by: https://github.com/Gericop/Android-Support-Preference-V7-Fix/commit/7de016b007e28a264001a8bb353f110a7f64bb69
+  *
+  * @author Mygod
+  */
+object PreferenceGroupAdapter {
+  private var preferenceLayoutsField: Field = _
+  private var fieldResId: Field = _
+  private var fieldWidgetResId: Field = _
+  private val preferenceViewHolderConstructor = classOf[PreferenceViewHolder].getDeclaredConstructor(classOf[View])
+
+  {
+    val oldClass = classOf[Old]
+    preferenceLayoutsField = oldClass.getDeclaredField("mPreferenceLayouts")
+    preferenceLayoutsField.setAccessible(true)
+    val c = oldClass.getDeclaredClasses.filter(c => c.getSimpleName == "PreferenceLayout").head
+    fieldResId = c.getDeclaredField("resId")
+    fieldResId.setAccessible(true)
+    fieldWidgetResId = c.getDeclaredField("widgetResId")
+    fieldWidgetResId.setAccessible(true)
+    preferenceViewHolderConstructor.setAccessible(true)
+  }
+}
+
+class PreferenceGroupAdapter(group: PreferenceGroup) extends Old(group) {
+  import PreferenceGroupAdapter._
+
+  protected lazy val preferenceLayouts = preferenceLayoutsField.get(this).asInstanceOf[List[AnyRef]]
+
+  override def onCreateViewHolder(parent: ViewGroup, viewType: Int) = if (Build.VERSION.SDK_INT < 21) {
+    val context = parent.getContext
+    val inflater = LayoutInflater.from(context)
+    val pl = preferenceLayouts.get(viewType)
+    val view = inflater.inflate(fieldResId.get(pl).asInstanceOf[Int], parent, false)
+    if (view.getBackground == null) {
+      val array = context.obtainStyledAttributes(null, R.styleable.BackgroundStyle)
+      var background = array.getDrawable(R.styleable.BackgroundStyle_android_selectableItemBackground)
+      if (background == null)
+        background = ContextCompat.getDrawable(context, android.R.drawable.list_selector_background)
+      array.recycle
+      val (s, t, e, b) = (ViewCompat.getPaddingStart(view), view.getPaddingTop,
+        ViewCompat.getPaddingEnd(view), view.getPaddingBottom)
+      view.setBackground(background)
+      ViewCompat.setPaddingRelative(view, s, t, e, b)
+    }
+    val widgetFrame = view.findViewById(android.R.id.widget_frame).asInstanceOf[ViewGroup]
+    if (widgetFrame != null) {
+      val widgetResId = fieldWidgetResId.get(pl).asInstanceOf[Int]
+      if (widgetResId != 0) inflater.inflate(widgetResId, widgetFrame) else widgetFrame.setVisibility(View.GONE)
+    }
+    preferenceViewHolderConstructor.newInstance(view)
+  } else super.onCreateViewHolder(parent, viewType)
+}
@@ -0,0 +1,25 @@
+package tk.mygod.preference
+
+import android.support.v7.preference.Preference
+
+/**
+ * Make your preference support %s in summary. Override getSummaryValue to customize what to put in.
+ * Based on:
+ * https://github.com/android/platform_frameworks_base/blob/master/core/java/android/preference/ListPreference.java
+ *
+ * @author Mygod
+ */
+trait SummaryPreference extends Preference {
+  protected def getSummaryValue: AnyRef
+
+  /**
+   * Returns the summary of this SummaryPreference. If the summary has a String formatting marker in it
+   * (i.e. "%s" or "%1$s"), then the current entry value will be substituted in its place.
+   *
+   * @return the summary with appropriate string substitution
+   */
+  override def getSummary = {
+    val summary = super.getSummary
+    if (summary == null) null else String.format(summary.toString, getSummaryValue)
+  }
+}
Author	SHA1	Message	Date
Max Lv	63fc69f495	Update shadowsocks-libev	2016-09-23 12:26:38 +08:00
Mygod	5761962754	Fix russian translation	2016-09-23 00:44:02 +08:00
Mygod	20506eeda8	Migrate to preference support library Fix #875. Step 1 for #762. Note: This will make main UI very different on 4.4.	2016-09-23 00:30:39 +08:00
Mygod	dd63bda2cd	Don't suppress log in debug builds	2016-09-22 21:18:02 +08:00
Mygod	e6d7a0855d	Suggest different local ports automatically in MU mode Refine #885	2016-09-22 20:38:33 +08:00
Mygod	4da89cd18e	Add support for ROM with TFO enabled as default	2016-09-22 20:16:22 +08:00
Mygod	66250eb66b	Update GMS	2016-09-22 20:16:14 +08:00
Max Lv	005c3443ae	Remove :bg from RunnerService	2016-09-22 10:13:04 +08:00
Max Lv	6b60f276b2	Enable UDP forwarding in ss-tunnel by default	2016-09-22 09:36:30 +08:00
Max Lv	0edbe01237	Fix #894	2016-09-22 09:34:35 +08:00
Max Lv	c87882e5d4	Fully disable IPv6 resolving in IPv4 mode, #890	2016-09-21 15:30:34 +08:00
Max Lv	8f80fbfd4a	Bump version	2016-09-21 14:08:49 +08:00
Max Lv	6ec8117e1c	Update shadowsocks-libev	2016-09-20 18:01:10 +08:00
Max Lv	3c68a26794	Update DNS forwarding	2016-09-20 08:40:13 +08:00
Max Lv	fda89933d0	Disable DNS forwarding in GFWList/ChinaList mode	2016-09-19 17:18:39 +08:00
Max Lv	d8f721db3b	Refine DNS resolve of GFWList and ChinaList, #887	2016-09-19 09:58:36 +08:00
Max Lv	28339ce7c1	Update DNS	2016-09-19 09:10:47 +08:00
Max Lv	edda3179dd	Add China List, close #886	2016-09-18 18:56:04 +08:00
Mygod	1d79990656	Remove workaround for libsuperuser#55	2016-09-15 12:22:21 +08:00
Mygod	2a47362195	Fix profile name not updated in ShadowsocksTileService	2016-09-15 00:11:37 +08:00
Mygod	02d5951f8b	Auto reset when downgrading While it's theoretically impossible to downgrade without reinstalling the app, there are ways to bypass this mechanism. And don't forget users can restore their app data as well.	2016-09-14 22:37:26 +08:00
Mygod	b126c62365	Fix a crash in AppManager	2016-09-14 18:16:44 +08:00
Mygod	bbaf1779ea	Add missing translation for Russian	2016-09-14 17:18:10 +08:00
Max Lv	65ddd6f5d8	Bump version	2016-09-14 14:57:02 +08:00
Max Lv	772bc18eb8	Bump version	2016-09-12 10:28:25 +08:00
Max Lv	d503818169	Add missing translation	2016-09-12 10:27:55 +08:00
Max Lv	b209e73386	Bump version	2016-09-12 10:11:16 +08:00
Max Lv	6c381b0ecc	Fix a crash reported by Goolge Play	2016-09-12 09:49:17 +08:00
Max Lv	e3f0fa6756	Fix #871	2016-09-09 22:13:51 +08:00
Max Lv	35cb273592	SuppressLint	2016-09-09 16:47:47 +08:00
Max Lv	b76f410c34	Refine header parser	2016-09-09 10:30:22 +08:00
Max Lv	d3678531b7	Bump version	2016-09-08 19:23:50 +08:00
Max Lv	122ca599de	Add GFWList support	2016-09-08 18:36:39 +08:00
Max Lv	96fcec788c	Add issue template	2016-09-05 16:24:51 +08:00
Max Lv	1c67b39a3e	Bump version	2016-09-04 10:31:33 +08:00
Max Lv	30fea4a705	Merge branch 'master' of github.com:shadowsocks/shadowsocks-android	2016-09-04 10:19:15 +08:00
Max Lv	6df227d231	Update kcptun	2016-08-28 18:11:29 +08:00