Update licenses

Refine #1122.

.gitignore

@@ -9,3 +9,4 @@ local.sbt
 
 mobile/src/main/libs
 mobile/src/main/obj
+mobile/src/main/jni/overture

.gitmodules

@@ -17,10 +17,6 @@
 	path = mobile/src/main/jni/redsocks
 	url = https://github.com/shadowsocks/redsocks.git
 	branch = shadowsocks-android
-[submodule "mobile/src/main/jni/pdnsd"]
-	path = mobile/src/main/jni/pdnsd
-	url = https://github.com/shadowsocks/pdnsd.git
-	branch = shadowsocks-android
 [submodule "mobile/src/main/jni/mbedtls"]
 	path = mobile/src/main/jni/mbedtls
 	url = https://github.com/ARMmbed/mbedtls
@@ -37,3 +33,6 @@
 [submodule "mobile/src/main/jni/libudns"]
 	path = mobile/src/main/jni/libudns
 	url = https://github.com/shadowsocks/libudns.git
+[submodule "mobile/src/overture"]
+	path = mobile/src/overture
+	url = https://github.com/shadowsocks/overture-android.git

.travis.yml

@@ -7,6 +7,7 @@ env:
     global:
         - NDK_VERSION=r12b
         - NDK_CCACHE=ccache
+        - GOROOT_BOOTSTRAP=$GOROOT
         - ANDROID_NDK_HOME=$HOME/.android/android-ndk-${NDK_VERSION}
         - SBTPATH=$HOME/.sbt
         - PATH=${ANDROID_NDK_HOME}:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools:${PATH}
@@ -49,4 +50,4 @@ install:
       fi
 
 script:
-    - $SBTPATH/sbt android:package
+    - $SBTPATH/sbt go-build android:package

README.md

@@ -50,7 +50,7 @@ Translators can go to [POEditor](https://poeditor.com/join/project/u5VHO9vhSf) t
     <li>pcre: <a href="https://android.googlesource.com/platform/external/pcre/+/master/dist2/LICENCE">BSD</a></li>
     <li>libancillary: <a href="https://github.com/shadowsocks/libancillary/blob/shadowsocks-android/COPYING">BSD</a></li>
     <li>shadowsocks-libev: <a href="https://github.com/shadowsocks/shadowsocks-libev/blob/master/LICENSE">GPLv3</a></li>
-    <li>pdnsd: <a href="https://github.com/shadowsocks/shadowsocks-android/blob/master/src/main/jni/pdnsd/COPYING">GPLv3</a></li>
+    <li>overture: <a href="https://github.com/shawn1m/overture/blob/master/LICENSE">MIT</a></li>
     <li>libev: <a href="https://github.com/shadowsocks/shadowsocks-libev/blob/master/libev/LICENSE">GPLv2</a></li>
     <li>libsodium: <a href="https://github.com/jedisct1/libsodium/blob/master/LICENSE">ISC</a></li>
     <li>libudns: <a href="https://github.com/shadowsocks/libudns/blob/master/COPYING.LGPL">LGPL</a></li>

build.sbt

@@ -18,7 +18,7 @@ lazy val commonSettings = Seq(
   typedResources := false
 )
 
-val supportLibsVersion = "25.1.1"
+val supportLibsVersion = "25.2.0"
 lazy val root = Project(id = "shadowsocks-android", base = file("."))
   .settings(commonSettings)
   .aggregate(plugin, mobile)

mobile/build.sbt

@@ -2,8 +2,8 @@ enablePlugins(AndroidApp)
 android.useSupportVectors
 
 name := "shadowsocks"
-version := "4.0.1"
-versionCode := Some(176)
+version := "4.1.0"
+versionCode := Some(180)
 
 proguardOptions ++=
   "-keep class com.github.shadowsocks.JniHelper { *; }" ::
@@ -15,24 +15,32 @@ proguardOptions ++=
 
 resConfigs := Seq("ja", "ru", "zh-rCN", "zh-rTW")
 
-val playServicesVersion = "10.0.1"
+val playServicesVersion = "10.2.0"
 resolvers += Resolver.jcenterRepo
 libraryDependencies ++=
   "com.futuremind.recyclerfastscroll" % "fastscroll" % "0.2.5" ::
-  "com.evernote" % "android-job" % "1.1.5" ::
+  "com.evernote" % "android-job" % "1.1.7" ::
   "com.github.jorgecastilloprz" % "fabprogresscircle" % "1.01" ::
   "com.google.android.gms" % "play-services-ads" % playServicesVersion ::
   "com.google.android.gms" % "play-services-analytics" % playServicesVersion ::
   "com.google.android.gms" % "play-services-gcm" % playServicesVersion ::
   "com.j256.ormlite" % "ormlite-android" % "5.0" ::
   "com.mikepenz" % "crossfader" % "1.5.0" ::
-  "com.mikepenz" % "fastadapter" % "2.1.6" ::
+  "com.mikepenz" % "fastadapter" % "2.1.7" ::
   "com.mikepenz" % "iconics-core" % "2.8.2" ::
-  "com.mikepenz" % "materialdrawer" % "5.8.1" ::
-  "com.mikepenz" % "materialize" % "1.0.0" ::
+  "com.mikepenz" % "materialdrawer" % "5.8.2" ::
+  "com.mikepenz" % "materialize" % "1.0.1" ::
   "com.squareup.okhttp3" % "okhttp" % "3.6.0" ::
   "com.twofortyfouram" % "android-plugin-api-for-locale" % "1.0.2" ::
   "dnsjava" % "dnsjava" % "2.1.8" ::
   "eu.chainfire" % "libsuperuser" % "1.0.0.201608240809" ::
   "net.glxn.qrgen" % "android" % "2.0" ::
   Nil
+
+lazy val goBuild = TaskKey[Unit]("go-build", "Build go and kcptun")
+goBuild := {
+  Process(Seq("mobile/src/overture/make.bash", minSdkVersion.value)) ! streams.value.log match {
+    case 0 => // Success!
+    case n => sys.error(s"Native build script exit code: $n")
+  }
+}

mobile/src/main/AndroidManifest.xml

@@ -144,6 +144,8 @@
                  android:process=":bg"/>
         <service android:name="com.evernote.android.job.gcm.PlatformGcmService"
                  android:process=":bg"/>
+        <service android:name="com.evernote.android.job.JobRescheduleService"
+                 android:process=":bg"/>
         <receiver android:name="com.evernote.android.job.v14.PlatformAlarmReceiver"
                   android:process=":bg"/>
         <receiver android:name="com.evernote.android.job.JobBootReceiver"

mobile/src/main/assets/overture/hosts

@@ -0,0 +1 @@
+127.0.0.1 localhost

mobile/src/main/assets/pages/about.html

@@ -296,7 +296,7 @@ along with this program. If not, see <a href="http://www.gnu.org/licenses/">http
     <li>pcre: <a href="https://android.googlesource.com/platform/external/pcre/+/master/dist2/LICENCE">BSD</a></li>
     <li>libancillary: <a href="https://github.com/shadowsocks/libancillary/blob/shadowsocks-android/COPYING">BSD</a></li>
     <li>shadowsocks-libev: <a href="https://github.com/shadowsocks/shadowsocks-libev/blob/master/LICENSE">GPLv3</a></li>
-    <li>pdnsd: <a href="https://github.com/shadowsocks/shadowsocks-android/blob/master/src/main/jni/pdnsd/COPYING">GPLv3</a></li>
+    <li>overture: <a href="https://github.com/shawn1m/overture/blob/master/LICENSE">MIT</a></li>
     <li>libev: <a href="https://github.com/shadowsocks/shadowsocks-libev/blob/master/libev/LICENSE">GPLv2</a></li>
     <li>libsodium: <a href="https://github.com/jedisct1/libsodium/blob/master/LICENSE">ISC</a></li>
     <li>libudns: <a href="https://github.com/shadowsocks/libudns/blob/master/COPYING.LGPL">LGPL</a></li>

mobile/src/main/java/com/github/shadowsocks/JniHelper.java

@@ -54,7 +54,19 @@ public class JniHelper {
                 ? new ErrnoException("kill", errno) : new Exception("kill failed: " + errno);
     }
 
+    @Deprecated // only implemented for before API 24
+    public static boolean waitForCompat(Process process, long millis) throws Exception {
+        if (Build.VERSION.SDK_INT >= 24) throw new UnsupportedOperationException("Never call this method in OpenJDK!");
+        final Object mutex = getExitValueMutex(process);
+        synchronized (mutex) {
+            if (getExitValue(process) == null) mutex.wait(millis);
+            return getExitValue(process) != null;
+        }
+    }
+
     private static native int sigterm(Process process);
+    private static native Integer getExitValue(Process process);
+    private static native Object getExitValueMutex(Process process);
     public static native int sendFd(int fd, String path);
     public static native void close(int fd);
 }

mobile/src/main/jni/Android.mk

@@ -117,6 +117,22 @@ LOCAL_SRC_FILES := $(addprefix libancillary/, $(ANCILLARY_SOURCE))
 
 include $(BUILD_STATIC_LIBRARY)
 
+########################################################
+## libbloom
+########################################################
+
+include $(CLEAR_VARS)
+
+BLOOM_SOURCE := bloom.c murmur2/MurmurHash2.c
+
+LOCAL_MODULE := libbloom
+LOCAL_CFLAGS += -O2 -I$(LOCAL_PATH)/shadowsocks-libev/libbloom \
+				-I$(LOCAL_PATH)/shadowsocks-libev/libbloom/murmur2
+
+LOCAL_SRC_FILES := $(addprefix shadowsocks-libev/libbloom/, $(BLOOM_SOURCE))
+
+include $(BUILD_STATIC_LIBRARY)
+
 ########################################################
 ## libipset
 ########################################################
@@ -223,23 +239,6 @@ LOCAL_CFLAGS := -O2 -std=gnu99 -DUSE_IPTABLES \
 
 include $(BUILD_SHARED_EXECUTABLE)
 
-########################################################
-## pdnsd
-########################################################
-
-include $(CLEAR_VARS)
-
-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)/libancillary
-LOCAL_STATIC_LIBRARIES := libancillary
-LOCAL_LDLIBS := -llog
-
-include $(BUILD_SHARED_EXECUTABLE)
-
 ########################################################
 ## shadowsocks-libev local
 ########################################################
@@ -250,7 +249,7 @@ SHADOWSOCKS_SOURCES := local.c \
 	cache.c udprelay.c utils.c netutils.c json.c jconf.c \
 	acl.c http.c tls.c rule.c \
 	crypto.c aead.c stream.c base64.c \
-	plugin.c \
+	plugin.c ppbloom.c \
 	android.c
 
 LOCAL_MODULE    := ss-local
@@ -264,13 +263,14 @@ LOCAL_CFLAGS    := -Wall -O2 -fno-strict-aliasing -DMODULE_LOCAL \
 					-I$(LOCAL_PATH)/mbedtls/include  \
 					-I$(LOCAL_PATH)/pcre \
 					-I$(LOCAL_PATH)/libudns \
-					-I$(LOCAL_PATH)/shadowsocks-libev/libcork/include \
 					-I$(LOCAL_PATH)/libsodium/src/libsodium/include \
 					-I$(LOCAL_PATH)/libsodium/src/libsodium/include/sodium \
+					-I$(LOCAL_PATH)/shadowsocks-libev/libcork/include \
 					-I$(LOCAL_PATH)/shadowsocks-libev/libipset/include \
+					-I$(LOCAL_PATH)/shadowsocks-libev/libbloom \
 					-I$(LOCAL_PATH)/libev
 
-LOCAL_STATIC_LIBRARIES := libev libmbedtls libipset libcork libudns \
+LOCAL_STATIC_LIBRARIES := libev libmbedtls libipset libcork libbloom libudns \
 	libsodium libancillary libpcre
 
 LOCAL_LDLIBS := -llog
@@ -286,7 +286,7 @@ include $(CLEAR_VARS)
 SHADOWSOCKS_SOURCES := tunnel.c \
 	cache.c udprelay.c utils.c netutils.c json.c jconf.c \
 	crypto.c aead.c stream.c base64.c \
-	plugin.c \
+	plugin.c ppbloom.c \
 	android.c
 
 LOCAL_MODULE    := ss-tunnel
@@ -297,14 +297,15 @@ LOCAL_CFLAGS    := -Wall -O2 -fno-strict-aliasing -DMODULE_TUNNEL \
 					-I$(LOCAL_PATH)/libancillary \
 					-I$(LOCAL_PATH)/include \
 					-I$(LOCAL_PATH)/libudns \
-					-I$(LOCAL_PATH)/shadowsocks-libev/libcork/include \
 					-I$(LOCAL_PATH)/libsodium/src/libsodium/include \
 					-I$(LOCAL_PATH)/libsodium/src/libsodium/include/sodium \
 					-I$(LOCAL_PATH)/mbedtls/include \
 					-I$(LOCAL_PATH)/libev \
+					-I$(LOCAL_PATH)/shadowsocks-libev/libcork/include \
+					-I$(LOCAL_PATH)/shadowsocks-libev/libbloom \
 					-I$(LOCAL_PATH)/include/shadowsocks-libev
 
-LOCAL_STATIC_LIBRARIES := libev libmbedtls libsodium libcork libudns libancillary
+LOCAL_STATIC_LIBRARIES := libev libmbedtls libsodium libcork libbloom libudns libancillary
 
 LOCAL_LDLIBS := -llog
 
@@ -476,6 +477,17 @@ LOCAL_SRC_FILES := $(addprefix pcre/, $(libpcre_src_files))
 
 include $(BUILD_STATIC_LIBRARY)
 
+########################################################
+## overture
+########################################################
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := overture
+LOCAL_SRC_FILES := overture/$(TARGET_ARCH_ABI)/liboverture.so
+
+include $(PREBUILT_SHARED_LIBRARY)
+
 # Import cpufeatures
 $(call import-module,android/cpufeatures)
 

mobile/src/main/jni/jni-helper.cpp

@@ -22,7 +22,7 @@
 #define THROW(env, clazz, msg) do { env->ThrowNew(env->FindClass(clazz), msg); } while (0)
 
 static jclass ProcessImpl;
-static jfieldID ProcessImpl_pid;
+static jfieldID ProcessImpl_pid, ProcessImpl_exitValue, ProcessImpl_exitValueMutex;
 
 static int sdk_version() {
     char version[PROP_VALUE_MAX + 1];
@@ -41,6 +41,24 @@ jint Java_com_github_shadowsocks_jnihelper_sigterm(JNIEnv *env, jobject thiz, jo
     return kill(pid, SIGTERM) == -1 && errno != ESRCH ? errno : 0;
 }
 
+jobject Java_com_github_shadowsocks_jnihelper_getExitValue(JNIEnv *env, jobject thiz, jobject process) {
+    if (!env->IsInstanceOf(process, ProcessImpl)) {
+        THROW(env, "java/lang/ClassCastException",
+                   "Unsupported process object. Only java.lang.ProcessManager$ProcessImpl is accepted.");
+        return NULL;
+    }
+    return env->GetObjectField(process, ProcessImpl_exitValue);
+}
+
+jobject Java_com_github_shadowsocks_jnihelper_getExitValueMutex(JNIEnv *env, jobject thiz, jobject process) {
+    if (!env->IsInstanceOf(process, ProcessImpl)) {
+        THROW(env, "java/lang/ClassCastException",
+                   "Unsupported process object. Only java.lang.ProcessManager$ProcessImpl is accepted.");
+        return NULL;
+    }
+    return env->GetObjectField(process, ProcessImpl_exitValueMutex);
+}
+
 void Java_com_github_shadowsocks_jnihelper_close(JNIEnv *env, jobject thiz, jint fd) {
     close(fd);
 }
@@ -84,11 +102,13 @@ static JNINativeMethod method_table[] = {
     { "sendFd", "(ILjava/lang/String;)I",
         (void*) Java_com_github_shadowsocks_jnihelper_sendfd },
     { "sigterm", "(Ljava/lang/Process;)I",
-        (void*) Java_com_github_shadowsocks_jnihelper_sigterm }
+        (void*) Java_com_github_shadowsocks_jnihelper_sigterm },
+    { "getExitValue", "(Ljava/lang/Process;)Ljava/lang/Integer;",
+        (void*) Java_com_github_shadowsocks_jnihelper_getExitValue },
+    { "getExitValueMutex", "(Ljava/lang/Process;)Ljava/lang/Object;",
+        (void*) Java_com_github_shadowsocks_jnihelper_getExitValueMutex }
 };
 
-
-
 /*
  * Register several native methods for one class.
  */
@@ -161,6 +181,14 @@ jint JNI_OnLoad(JavaVM* vm, void* reserved) {
             THROW(env, "java/lang/RuntimeException", "ProcessManager$ProcessImpl.pid not found");
             goto bail;
         }
+        if (!(ProcessImpl_exitValue = env->GetFieldID(ProcessImpl, "exitValue", "Ljava/lang/Integer;"))) {
+            THROW(env, "java/lang/RuntimeException", "ProcessManager$ProcessImpl.exitValue not found");
+            goto bail;
+        }
+        if (!(ProcessImpl_exitValueMutex = env->GetFieldID(ProcessImpl, "exitValueMutex", "Ljava/lang/Object;"))) {
+            THROW(env, "java/lang/RuntimeException", "ProcessManager$ProcessImpl.exitValueMutex not found");
+            goto bail;
+        }
     }
 
     result = JNI_VERSION_1_6;

mobile/src/main/scala/com/github/shadowsocks/BaseService.scala

@@ -39,11 +39,11 @@ import com.github.shadowsocks.database.Profile
 import com.github.shadowsocks.plugin.{PluginConfiguration, PluginManager, PluginOptions}
 import com.github.shadowsocks.utils._
 import okhttp3.{Dns, FormBody, OkHttpClient, Request}
-import org.json.JSONObject
+import org.json.{JSONArray, JSONObject}
 
+import scala.collection.JavaConversions._
 import scala.collection.mutable
 import scala.collection.mutable.ArrayBuffer
-import scala.collection.JavaConversions._
 import scala.util.Random
 
 trait BaseService extends Service {
@@ -135,9 +135,9 @@ trait BaseService extends Service {
           case Some(ip) => util.Arrays.asList(InetAddress.getByName(ip))
           case _ => Dns.SYSTEM.lookup(hostname)
         })
-        .connectTimeout(10, TimeUnit.SECONDS)
-        .writeTimeout(10, TimeUnit.SECONDS)
-        .readTimeout(30, TimeUnit.SECONDS)
+        .connectTimeout(5, TimeUnit.SECONDS)
+        .writeTimeout(5, TimeUnit.SECONDS)
+        .readTimeout(5, TimeUnit.SECONDS)
         .build()
       val requestBody = new FormBody.Builder()
         .add("sig", sig)
@@ -328,4 +328,60 @@ trait BaseService extends Service {
     IOUtils.writeString(new File(getFilesDir, file), config.toString)
     file
   }
+
+  protected final def buildOvertureConfig(file: String): String = {
+    val url = "http://icanhazip.com"
+    val client = new OkHttpClient.Builder()
+      .connectTimeout(10, TimeUnit.SECONDS)
+      .writeTimeout(10, TimeUnit.SECONDS)
+      .readTimeout(30, TimeUnit.SECONDS)
+      .build()
+    val request = new Request.Builder()
+      .url(url)
+      .build()
+    val response = client.newCall(request).execute()
+    val externalIp = if (response.isSuccessful) response.body.string.trim else ""
+
+    val config = new JSONObject()
+      .put("BindAddress", ":" + (profile.localPort + 53))
+      .put("RedirectIPv6Record", true)
+      .put("DomainBase64Decode", true)
+      .put("HostsFile", "hosts")
+      .put("MinimumTTL", 3600)
+      .put("CacheSize", 4096)
+    def makeDns(name: String, address: String, edns: Boolean = true) = {
+      val dns = new JSONObject()
+        .put("Name", name)
+        .put("Address", address + ":53")
+        .put("Timeout", 6)
+      if (edns) dns
+        .put("Protocol", "tcp")
+        .put("Socks5Address", "127.0.0.1:" + profile.localPort)
+        .put("EDNSClientSubnet", new JSONObject()
+          .put("Policy", "auto")
+          .put("ExternalIP", externalIp))
+      else dns
+        .put("Protocol", "udp")
+        .put("EDNSClientSubnet", new JSONObject().put("Policy", "disable"))
+      dns
+    }
+    profile.route match {
+      case Acl.BYPASS_CHN | Acl.BYPASS_LAN_CHN | Acl.GFWLIST | Acl.CUSTOM_RULES => config
+        .put("PrimaryDNS", new JSONArray(Array(
+          makeDns("Primary-1", "119.29.29.29", edns = false),
+          makeDns("Primary-2", "114.114.114.114", edns = false)
+        )))
+        .put("AlternativeDNS", new JSONArray().put(makeDns("Alternative", profile.remoteDns)))
+        .put("IPNetworkFile", "china_ip_list.txt")
+        .put("DomainFile", "gfwlist.txt")
+      case Acl.CHINALIST => config
+        .put("PrimaryDNS", new JSONArray().put(makeDns("Primary", "119.29.29.29")))
+        .put("AlternativeDNS", new JSONArray().put(makeDns("Alternative", profile.remoteDns)))
+      case _ => config
+        .put("PrimaryDNS", new JSONArray().put(makeDns("Primary", profile.remoteDns)))
+        .put("AlternativeDNS", new JSONArray().put(makeDns("Alternative", "208.67.222.222")))
+    }
+    IOUtils.writeString(new File(getFilesDir, file), config.toString)
+    file
+  }
 }

mobile/src/main/scala/com/github/shadowsocks/GuardedProcess.scala

@@ -115,7 +115,7 @@ class GuardedProcess(cmd: String*) {
   private def destroyProcess() {
     if (Build.VERSION.SDK_INT < 24) {
       JniHelper.sigtermCompat(process)
-      process.waitFor()
+      JniHelper.waitForCompat(process, 500)
     }
     process.destroy()
   }

mobile/src/main/scala/com/github/shadowsocks/MainActivity.scala

@@ -84,11 +84,6 @@ class MainActivity extends Activity with ServiceBoundContext with Drawer.OnDrawe
   private var txRateText: TextView = _
   private var rxRateText: TextView = _
 
-  private var currentFragment: ToolbarFragment = _
-  private lazy val profilesFragment = new ProfilesFragment()
-  private lazy val customRulesFragment = new CustomRulesFragment()
-  private lazy val globalSettingsFragment = new GlobalSettingsFragment()
-  private lazy val aboutFragment = new AboutFragment()
   private lazy val customTabsIntent = new CustomTabsIntent.Builder()
     .setToolbarColor(ContextCompat.getColor(this, R.color.material_primary_500))
     .build()
@@ -255,7 +250,7 @@ class MainActivity extends Activity with ServiceBoundContext with Drawer.OnDrawe
     val tf = Typefaces.get(this, "fonts/Iceland.ttf")
     if (tf != null) title.setTypeface(tf)
 
-    if (savedInstanceState == null) displayFragment(profilesFragment)
+    if (savedInstanceState == null) displayFragment(new ProfilesFragment)
     statusText = findViewById(R.id.status).asInstanceOf[TextView]
     txText = findViewById(R.id.tx).asInstanceOf[TextView]
     txRateText = findViewById(R.id.txRate).asInstanceOf[TextView]
@@ -364,14 +359,13 @@ class MainActivity extends Activity with ServiceBoundContext with Drawer.OnDrawe
   }
 
   private def displayFragment(fragment: ToolbarFragment) {
-    currentFragment = fragment
     getFragmentManager.beginTransaction().replace(R.id.fragment_holder, fragment).commitAllowingStateLoss()
     drawer.closeDrawer()
   }
 
   override def onItemClick(view: View, position: Int, drawerItem: IDrawerItem[_, _ <: ViewHolder]): Boolean = {
     drawerItem.getIdentifier match {
-      case DRAWER_PROFILES => displayFragment(profilesFragment)
+      case DRAWER_PROFILES => displayFragment(new ProfilesFragment)
       case DRAWER_RECOVERY =>
         app.track("GlobalConfigFragment", "reset")
         if (bgService != null) bgService.use(-1)
@@ -384,12 +378,12 @@ class MainActivity extends Activity with ServiceBoundContext with Drawer.OnDrawe
           app.copyAssets()
           handler.sendEmptyMessage(0)
         }
-      case DRAWER_GLOBAL_SETTINGS => displayFragment(globalSettingsFragment)
+      case DRAWER_GLOBAL_SETTINGS => displayFragment(new GlobalSettingsFragment)
       case DRAWER_ABOUT =>
         app.track(TAG, "about")
-        displayFragment(aboutFragment)
+        displayFragment(new AboutFragment)
       case DRAWER_FAQ => launchUrl(getString(R.string.faq_url))
-      case DRAWER_CUSTOM_RULES => displayFragment(customRulesFragment)
+      case DRAWER_CUSTOM_RULES => displayFragment(new CustomRulesFragment)
     }
     true  // unexpected cases will throw exception
   }
@@ -408,12 +402,14 @@ class MainActivity extends Activity with ServiceBoundContext with Drawer.OnDrawe
     setListeningForBandwidth(true)
   }
 
-  override def onBackPressed(): Unit =
-    if (drawer.isDrawerOpen) drawer.closeDrawer() else if (!currentFragment.onBackPressed())
-      if (currentFragment != profilesFragment) {
-        displayFragment(profilesFragment)
+  override def onBackPressed(): Unit = if (drawer.isDrawerOpen) drawer.closeDrawer() else {
+    val currentFragment = getFragmentManager.findFragmentById(R.id.fragment_holder).asInstanceOf[ToolbarFragment]
+    if (!currentFragment.onBackPressed())
+      if (currentFragment.isInstanceOf[ProfilesFragment]) super.onBackPressed() else {
+        displayFragment(new ProfilesFragment)
         drawer.setSelection(DRAWER_PROFILES)
-      } else super.onBackPressed()
+      }
+  }
 
   override def onStop() {
     setListeningForBandwidth(false)

mobile/src/main/scala/com/github/shadowsocks/ShadowsocksApplication.scala

@@ -197,15 +197,17 @@ class ShadowsocksApplication extends Application {
 
   def copyAssets() {
     val assetManager = getAssets
-    var files: Array[String] = null
-    try files = assetManager.list("acl") catch {
-      case e: IOException =>
-        Log.e(TAG, e.getMessage)
-        app.track(e)
+    for (dir <- List("acl", "overture")) {
+      var files: Array[String] = null
+      try files = assetManager.list(dir) catch {
+        case e: IOException =>
+          Log.e(TAG, e.getMessage)
+          app.track(e)
+      }
+      if (files != null) for (file <- files) autoClose(assetManager.open(dir + "/" + file))(in =>
+        autoClose(new FileOutputStream(new File(getFilesDir, file)))(out =>
+          IOUtils.copy(in, out)))
     }
-    if (files != null) for (file <- files) autoClose(assetManager.open("acl/" + file))(in =>
-      autoClose(new FileOutputStream(new File(getFilesDir, file)))(out =>
-        IOUtils.copy(in, out)))
     editor.putInt(Key.currentVersionCode, BuildConfig.VERSION_CODE).apply()
   }
 

mobile/src/main/scala/com/github/shadowsocks/ShadowsocksNatService.scala

@@ -49,7 +49,7 @@ class ShadowsocksNatService extends BaseService {
   var sslocalProcess: GuardedProcess = _
   var sstunnelProcess: GuardedProcess = _
   var redsocksProcess: GuardedProcess = _
-  var pdnsdProcess: GuardedProcess = _
+  var overtureProcess: GuardedProcess = _
   var su: Shell.Interactive = _
 
   def startShadowsocksDaemon() {
@@ -74,7 +74,7 @@ class ShadowsocksNatService extends BaseService {
       "-t", "10",
       "-b", "127.0.0.1",
       "-l", (profile.localPort + 63).toString,
-      "-L", profile.remoteDns + ":53",
+      "-L", profile.remoteDns.trim + ":53",
       "-c", buildShadowsocksConfig("ss-tunnel-nat.conf"))
 
     if (profile.udpdns) cmd.append("-u")
@@ -83,21 +83,8 @@ class ShadowsocksNatService extends BaseService {
   }
 
   def startDnsDaemon() {
-    val reject = if (profile.ipv6) "224.0.0.0/3" else "224.0.0.0/3, ::/0"
-    IOUtils.writeString(new File(getFilesDir, "pdnsd-nat.conf"), profile.route match {
-      case Acl.BYPASS_CHN | Acl.BYPASS_LAN_CHN | Acl.GFWLIST | Acl.CUSTOM_RULES =>
-        ConfigUtils.PDNSD_DIRECT.formatLocal(Locale.ENGLISH, "", getCacheDir.getAbsolutePath,
-          "127.0.0.1", profile.localPort + 53, "114.114.114.114, 223.5.5.5, 1.2.4.8",
-          getBlackList, reject, profile.localPort + 63, reject)
-      case Acl.CHINALIST =>
-        ConfigUtils.PDNSD_DIRECT.formatLocal(Locale.ENGLISH, "", getCacheDir.getAbsolutePath,
-          "127.0.0.1", profile.localPort + 53, "8.8.8.8, 8.8.4.4, 208.67.222.222",
-          "", reject, profile.localPort + 63, reject)
-      case _ =>
-        ConfigUtils.PDNSD_LOCAL.formatLocal(Locale.ENGLISH, "", getCacheDir.getAbsolutePath,
-          "127.0.0.1", profile.localPort + 53, profile.localPort + 63, reject)
-    })
-    pdnsdProcess = new GuardedProcess(getApplicationInfo.nativeLibraryDir + "/libpdnsd.so", "-c", "pdnsd-nat.conf")
+    overtureProcess = new GuardedProcess(getApplicationInfo.nativeLibraryDir + "/liboverture.so",
+      "-c", buildOvertureConfig("overture-nat.conf"))
       .start()
   }
 
@@ -111,11 +98,13 @@ class ShadowsocksNatService extends BaseService {
   /** Called when the activity is first created. */
   def handleConnection() {
 
-    startDNSTunnel()
     startRedsocksDaemon()
     startShadowsocksDaemon()
 
-    if (!profile.udpdns) startDnsDaemon()
+    if (!profile.udpdns)
+      startDnsDaemon()
+    else
+      startDNSTunnel()
 
     setupIptables()
 
@@ -143,9 +132,9 @@ class ShadowsocksNatService extends BaseService {
       redsocksProcess.destroy()
       redsocksProcess = null
     }
-    if (pdnsdProcess != null) {
-      pdnsdProcess.destroy()
-      pdnsdProcess = null
+    if (overtureProcess != null) {
+      overtureProcess.destroy()
+      overtureProcess = null
     }
 
     su.addCommand("iptables -t nat -F OUTPUT")

mobile/src/main/scala/com/github/shadowsocks/ShadowsocksVpnService.scala

@@ -45,8 +45,7 @@ class ShadowsocksVpnService extends VpnService with BaseService {
   private var notification: ShadowsocksNotification = _
 
   var sslocalProcess: GuardedProcess = _
-  var sstunnelProcess: GuardedProcess = _
-  var pdnsdProcess: GuardedProcess = _
+  var overtureProcess: GuardedProcess = _
   var tun2socksProcess: GuardedProcess = _
 
   override def onBind(intent: Intent): IBinder = {
@@ -94,17 +93,13 @@ class ShadowsocksVpnService extends VpnService with BaseService {
       sslocalProcess.destroy()
       sslocalProcess = null
     }
-    if (sstunnelProcess != null) {
-      sstunnelProcess.destroy()
-      sstunnelProcess = null
-    }
     if (tun2socksProcess != null) {
       tun2socksProcess.destroy()
       tun2socksProcess = null
     }
-    if (pdnsdProcess != null) {
-      pdnsdProcess.destroy()
-      pdnsdProcess = null
+    if (overtureProcess != null) {
+      overtureProcess.destroy()
+      overtureProcess = null
     }
   }
 
@@ -149,15 +144,14 @@ class ShadowsocksVpnService extends VpnService with BaseService {
   /** Called when the activity is first created. */
   def handleConnection() {
     
-    val fd = startVpn()
-    if (!sendFd(fd)) throw new Exception("sendFd failed")
-
     startShadowsocksDaemon()
 
     if (!profile.udpdns) {
       startDnsDaemon()
-      startDnsTunnel()
     }
+
+    val fd = startVpn()
+    if (!sendFd(fd)) throw new Exception("sendFd failed")
   }
 
   override protected def buildPluginCommandLine(): ArrayBuffer[String] = super.buildPluginCommandLine() += "-V"
@@ -182,33 +176,10 @@ class ShadowsocksVpnService extends VpnService with BaseService {
     sslocalProcess = new GuardedProcess(cmd: _*).start()
   }
 
-  def startDnsTunnel(): Unit =
-    sstunnelProcess = new GuardedProcess(getApplicationInfo.nativeLibraryDir + "/libss-tunnel.so",
-      "-V",
-      "-t", "10",
-      "-b", "127.0.0.1",
-      "-l", (profile.localPort + 63).toString,
-      "-L" , profile.remoteDns + ":53",
-      "-c", buildShadowsocksConfig("ss-tunnel-vpn.conf")).start()
-
   def startDnsDaemon() {
-    val reject = if (profile.ipv6) "224.0.0.0/3" else "224.0.0.0/3, ::/0"
-    IOUtils.writeString(new File(getFilesDir, "pdnsd-vpn.conf"), profile.route match {
-      case Acl.BYPASS_CHN | Acl.BYPASS_LAN_CHN | Acl.GFWLIST | Acl.CUSTOM_RULES =>
-        ConfigUtils.PDNSD_DIRECT.formatLocal(Locale.ENGLISH, "protect = \"protect_path\";", getCacheDir.getAbsolutePath,
-          "0.0.0.0", profile.localPort + 53, "114.114.114.114, 223.5.5.5, 1.2.4.8",
-          getBlackList, reject, profile.localPort + 63, reject)
-      case Acl.CHINALIST =>
-        ConfigUtils.PDNSD_DIRECT.formatLocal(Locale.ENGLISH, "protect = \"protect_path\";", getCacheDir.getAbsolutePath,
-          "0.0.0.0", profile.localPort + 53, "8.8.8.8, 8.8.4.4, 208.67.222.222",
-          "", reject, profile.localPort + 63, reject)
-      case _ =>
-        ConfigUtils.PDNSD_LOCAL.formatLocal(Locale.ENGLISH, "protect = \"protect_path\";", getCacheDir.getAbsolutePath,
-          "0.0.0.0", profile.localPort + 53, profile.localPort + 63, reject)
-    })
-    val cmd = Array(getApplicationInfo.nativeLibraryDir + "/libpdnsd.so", "-c", "pdnsd-vpn.conf")
-
-    pdnsdProcess = new GuardedProcess(cmd: _*).start()
+    overtureProcess = new GuardedProcess(getApplicationInfo.nativeLibraryDir + "/liboverture.so",
+      "-c", buildOvertureConfig("overture-vpn.conf"), "-V")
+      .start()
   }
 
   def startVpn(): Int = {
@@ -219,7 +190,7 @@ class ShadowsocksVpnService extends VpnService with BaseService {
       .setMtu(VPN_MTU)
       .addAddress(PRIVATE_VLAN.formatLocal(Locale.ENGLISH, "1"), 24)
 
-    builder.addDnsServer(profile.remoteDns)
+    builder.addDnsServer(profile.remoteDns.trim)
 
     if (profile.ipv6) {
       builder.addAddress(PRIVATE_VLAN6.formatLocal(Locale.ENGLISH, "1"), 126)
@@ -251,6 +222,7 @@ class ShadowsocksVpnService extends VpnService with BaseService {
         val subnet = Subnet.fromString(cidr)
         builder.addRoute(subnet.address.getHostAddress, subnet.prefixSize)
       })
+      builder.addRoute(profile.remoteDns.trim, 32)
     }
 
     conn = builder.establish()

mobile/src/main/scala/com/github/shadowsocks/acl/Subnet.scala

@@ -1,6 +1,7 @@
 package com.github.shadowsocks.acl
 
 import java.net.InetAddress
+import java.util.Objects
 
 import com.github.shadowsocks.utils.Utils
 
@@ -26,6 +27,12 @@ class Subnet(val address: InetAddress, val prefixSize: Int) extends Comparable[S
     }
     prefixSize compare that.prefixSize
   }
+
+  override def equals(other: Any): Boolean = other match {
+    case that: Subnet => address == that.address && prefixSize == that.prefixSize
+    case _ => false
+  }
+  override def hashCode: Int = Objects.hash(address, prefixSize: Integer)
 }
 
 object Subnet {

mobile/src/main/scala/com/github/shadowsocks/utils/Constants.scala

@@ -45,86 +45,6 @@ object ConfigUtils {
     " port = %d;\n" +
     " type = socks5;\n" +
     "}\n"
-
-  val PDNSD_LOCAL =
-    """
-      |global {
-      | perm_cache = 2048;
-      | %s
-      | cache_dir = "%s";
-      | server_ip = %s;
-      | server_port = %d;
-      | query_method = tcp_only;
-      | min_ttl = 15m;
-      | max_ttl = 1w;
-      | timeout = 10;
-      | daemon = off;
-      |}
-      |
-      |server {
-      | label = "local";
-      | ip = 127.0.0.1;
-      | port = %d;
-      | reject = %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_DIRECT =
-    """
-      |global {
-      | perm_cache = 2048;
-      | %s
-      | cache_dir = "%s";
-      | server_ip = %s;
-      | server_port = %d;
-      | query_method = udp_only;
-      | min_ttl = 15m;
-      | max_ttl = 1w;
-      | timeout = 10;
-      | daemon = off;
-      | par_queries = 4;
-      |}
-      |
-      |server {
-      | label = "remote-servers";
-      | ip = %s;
-      | timeout = 3;
-      | query_method = udp_only;
-      | %s
-      | policy = included;
-      | reject = %s;
-      | reject_policy = fail;
-      | reject_recursively = on;
-      |}
-      |
-      |server {
-      | label = "local-server";
-      | ip = 127.0.0.1;
-      | query_method = tcp_only;
-      | port = %d;
-      | reject = %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
 }
 
 object Key {

mobile/src/main/scala/com/github/shadowsocks/utils/Parser.scala

@@ -26,7 +26,7 @@ import com.github.shadowsocks.database.Profile
 
 object Parser {
   val TAG = "ShadowParser"
-  private val pattern = "(?i)^ss://[-a-zA-Z0-9+&@#/%?=~_|!:,.;]*[-a-zA-Z0-9+&@#/%=~_|]$".r
+  private val pattern = "(?i)ss://[-a-zA-Z0-9+&@#/%?=~_|!:,.;]*[-a-zA-Z0-9+&@#/%=~_|]".r
   private val userInfoPattern = "^(.+?):(.*)$".r
   private val legacyPattern = "^((.+?):(.*)@(.+?):(\\d+?))$".r
 
@@ -34,7 +34,7 @@ object Parser {
     pattern.findAllMatchIn(if (data == null) "" else data).map(m => {
       val uri = Uri.parse(m.matched)
       uri.getUserInfo match {
-        case null => uri.getHost match {
+        case null => new String(Base64.decode(uri.getHost, Base64.NO_PADDING), "UTF-8") match {
           case legacyPattern(_, method, password, host, port) =>  // legacy uri
             val profile = new Profile
             profile.method = method.toLowerCase
@@ -49,7 +49,7 @@ object Parser {
             null
         }
         case userInfo =>
-          new String(Base64.decode(userInfo, Base64.NO_PADDING | Base64.NO_WRAP | Base64.URL_SAFE)) match {
+          new String(Base64.decode(userInfo, Base64.NO_PADDING | Base64.NO_WRAP | Base64.URL_SAFE), "UTF-8") match {
             case userInfoPattern(method, password) =>
               val profile = new Profile
               profile.method = method

plugin/CHANGES.md

@@ -0,0 +1,6 @@
+* 0.0.3:
+  * Update support library version to 25.2.0.
+* 0.0.2:
+  * Add `getOrDefault` to `PluginOptions`;
+  * Update support library version to 25.1.1.
+* 0.0.1: Initial release.

plugin/README.md

@@ -1,5 +1,7 @@
 # shadowsocks-android plugin framework
 
+[Documentation](doc.md) | [Change log](CHANGES.md)
+
 Support library for easier development on [shadowsocks
  plugin](https://github.com/shadowsocks/shadowsocks-org/issues/28) for Android. Also includes some
  useful resources to easily get consistent styling with the main app.
@@ -19,9 +21,6 @@ This library is designed with Java interoperability in mind so theoretically you
  library with other languages and/or build tools but there isn't documentation for that yet. This
  guide is written for Scala + SBT. Contributions are welcome.
 
-The following is just a simple guide to get you started, for more technical details, see
- [doc.md](https://github.com/shadowsocks/shadowsocks-android/blob/develop/plugin/doc.md).
-
 ### Package name
 
 There are no arbitrary restrictions/requirements on package name, component name and content
@@ -37,7 +36,7 @@ First you need to add this library to your dependencies. This library is written
  and it's most convenient to use it with SBT:
 
 ```scala
-libraryDependencies += "com.github.shadowsocks" %% "plugin" % "0.0.1"
+libraryDependencies += "com.github.shadowsocks" %% "plugin" % "0.0.2"
 ```
 
 ### Native binary configuration

plugin/build.sbt

@@ -2,7 +2,7 @@ enablePlugins(AndroidLib)
 android.useSupportVectors
 
 name := "plugin"
-version := "0.0.2"
+version := "0.0.3"
 
 pomExtra in Global := {
   <url>https://github.com/shadowsocks/shadowsocks-android</url>

plugin/doc.md

@@ -196,7 +196,7 @@ This feature hasn't been implemented yet.
 Plugins are certified using package signatures and shadowsocks-android will consider these
  signatures as trusted:
 
-* Signatures by [trusted sources](https://github.com/shadowsocks/shadowsocks-android/blob/develop/mobile/src/main/scala/com/github/shadowsocks/plugin/PluginManager.scala#L22)
+* Signatures by [trusted sources](/mobile/src/main/scala/com/github/shadowsocks/plugin/PluginManager.scala#L22)
   which includes:
   - @madeye, i.e. the signer of the main repo;
   - The main repo doesn't contain any other trusted signatures. Third-party forks should add their
@@ -226,5 +226,5 @@ Plugin app must include this in their application tag: (which should be automati
 
 ```
 <meta-data android:name="com.github.shadowsocks.plugin.version"
-           android:value="0.0.1"/>
+           android:value="0.0.2"/>
 ```

plugin/src/main/AndroidManifest.xml

@@ -6,6 +6,6 @@
     <application
             android:theme="@style/Theme.Shadowsocks">
         <meta-data android:name="com.github.shadowsocks.plugin.version"
-                   android:value="0.0.1"/>
+                   android:value="0.0.2"/>
     </application>
 </manifest>

project/plugins.sbt

@@ -1,4 +1,4 @@
-addSbtPlugin("org.scala-android" % "sbt-android" % "1.7.4")
+addSbtPlugin("org.scala-android" % "sbt-android" % "1.7.6")
 
 addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.1.10")