Update licenses

Add missing -V option
Fix typos
2017-03-02 14:53:53 +08:00 · 2017-03-02 09:28:12 +08:00 · 2017-03-02 09:22:40 +08:00 · 2017-03-01 22:49:10 +08:00 · 2017-03-01 22:28:35 +08:00 · 2017-03-01 17:25:23 +08:00
233 changed files with 15719 additions and 6130 deletions
@@ -0,0 +1,49 @@
+### Troubleshooting
+
+Cannot connect to server:
+
+1. Stop battery saver if it's active;
+2. If an upgrade breaks anything, do a manual reset first by pressing Reset at the end of the list;
+3. Check your config;
+4. Wipe app data.
+
+Crash: [Submit an issue](https://github.com/shadowsocks/shadowsocks-android/issues/new) with logcat attached, or submit a crash report to Google Play. Then, try wiping app data.
+
+### UI tips
+
+* Tap the number to enter the port you wish to use; (if the keyboard doesn't pop up automatically for some reason)
+* Use Tasker integration to create a desktop widget.
+
+### Why is NAT mode deprecated?
+
+1. Requiring ROOT permission;
+2. No IPv6 support;
+3. No UDP relay support.
+
+### How to remove the exclamation mark when using VPN mode?
+
+The exclamation mark in the Wi-Fi/cellular icon appears because the system fails to connect to portal server (defaults to `clients3.google.com`) without VPN connection. To remove it, follow the instructions in [this article](https://www.noisyfox.cn/45.html). (in Simplified Chinese)
+
+### Why are MIUI, EMUI and other AOSPs in China not officially supported?
+
+1. Broken VPNService implementation, especially for IPv6;
+2. Aggressive (or called broken) background service killing policy.
+
+* Fixes for MIUI: [#772](https://github.com/shadowsocks/shadowsocks-android/issues/772)
+* Fixes for Huawei: [#1091 (comment)](https://github.com/shadowsocks/shadowsocks-android/issues/1091#issuecomment-276949836)
+
+### How to pause Shadowsocks service?
+
+* For Android 7.0+: Use quick switch tile in Quick Settings;
+* Use Tasker integration;
+* Add a profile with per-app proxy enabled for Shadowsocks only, bypass mode off.
+
+### Why does Shadowsocks consume so much battery on Android 5.0+?
+
+As Shadowsocks takes over the whole device network, any battery used by network activities from other apps are also counted as those from Shadowsocks. So, the battery usage of Shadowsocks equals to the sum of all the network activities of your device. Shadowsocks itself is a totally I/O bound application on modern Android devices, which is expected not to consume any notable battery.
+
+So if you notice a significant increase in battery usage after you use Shadowsocks, it's most likely caused by other apps. For example, Google Play services can consume more battery after being able to connecting to Google, etc.
+
+### It works fine under Wi-Fi but can't connect through cellular data?
+
+Allow this app to consume background data in app settings.
@@ -1,4 +1,4 @@
-Please read FAQ in wiki then answer these questions before submitting your issue. Thanks!
+Please read FAQ then answer these questions before submitting your issue. Thanks!

 ### Environment

@@ -25,11 +25,12 @@ _Put an `x` inside the [ ] that applies._
  * [ ] Bypass LAN & China
  * [ ] GFW List
  * [ ] China List
+  * [ ] Custom rules
 * [ ] IPv6 route
 * [ ] Per-App Proxy
  * [ ] Bypass mode
 * [ ] UDP Forwarding
-* KCP Parameters: (leave blank if not enabled)
+* Plugin configuration (if applicable):
 * [ ] Auto Connect
 * [ ] TCP Fast Open
 * [ ] NAT mode
@@ -1,33 +1,12 @@
-classes
-bin
-gen
 target
 local.properties
-.classpath
-.project
-.settings
-tests/bin
-tests/gen
-tests/local.properties
-NUL
-gen_*
-*.class
-*.o
 local.sbt
-.deps
 /proguard-sbt.txt

 #Intellij IDEA
-*.iml
-*.ipr
-*.iws
 .idea/
-out/
 .d

-#NDK
-src/main/obj
-src/main/libs
-src/main/assets/armeabi-v7a/*
-src/main/assets/x86/*
-jni/Application.mk
+mobile/src/main/libs
+mobile/src/main/obj
+mobile/src/main/jni/overture
@@ -1,35 +1,38 @@
-[submodule "src/main/jni/shadowsocks-libev"]
-	path = src/main/jni/shadowsocks-libev
+[submodule "mobile/src/main/jni/shadowsocks-libev"]
+	path = mobile/src/main/jni/shadowsocks-libev
 	url = https://github.com/shadowsocks/shadowsocks-libev
-[submodule "src/main/jni/badvpn"]
-	path = src/main/jni/badvpn
+[submodule "mobile/src/main/jni/badvpn"]
+	path = mobile/src/main/jni/badvpn
 	url = https://github.com/shadowsocks/badvpn.git
 	branch = shadowsocks-android
-[submodule "src/main/jni/libancillary"]
-	path = src/main/jni/libancillary
+[submodule "mobile/src/main/jni/libancillary"]
+	path = mobile/src/main/jni/libancillary
 	url = https://github.com/shadowsocks/libancillary.git
 	branch = shadowsocks-android
-[submodule "src/main/jni/libevent"]
-	path = src/main/jni/libevent
+[submodule "mobile/src/main/jni/libevent"]
+	path = mobile/src/main/jni/libevent
 	url = https://github.com/shadowsocks/libevent.git
 	branch = shadowsocks-android
-[submodule "src/main/jni/redsocks"]
-	path = src/main/jni/redsocks
+[submodule "mobile/src/main/jni/redsocks"]
+	path = mobile/src/main/jni/redsocks
 	url = https://github.com/shadowsocks/redsocks.git
 	branch = shadowsocks-android
-[submodule "src/main/jni/pdnsd"]
-	path = src/main/jni/pdnsd
-	url = https://github.com/shadowsocks/pdnsd.git
-	branch = shadowsocks-android
-[submodule "kcptun/kcptun"]
-	path = kcptun/kcptun
-	url = https://github.com/shadowsocks/kcptun
-[submodule "kcptun/go"]
-	path = kcptun/go
-	url = https://github.com/shadowsocks/go
-[submodule "src/main/jni/mbedtls"]
-	path = src/main/jni/mbedtls
+[submodule "mobile/src/main/jni/mbedtls"]
+	path = mobile/src/main/jni/mbedtls
 	url = https://github.com/ARMmbed/mbedtls
-[submodule "src/main/jni/pcre"]
-	path = src/main/jni/pcre
+[submodule "mobile/src/main/jni/pcre"]
+	path = mobile/src/main/jni/pcre
 	url = https://android.googlesource.com/platform/external/pcre
+[submodule "mobile/src/main/jni/libsodium"]
+	path = mobile/src/main/jni/libsodium
+	url = https://github.com/jedisct1/libsodium.git
+	branch = stable
+[submodule "mobile/src/main/jni/libev"]
+	path = mobile/src/main/jni/libev
+	url = https://github.com/shadowsocks/libev.git
+[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
@@ -50,4 +50,4 @@ install:
      fi

 script:
-    - $SBTPATH/sbt native-build android:package-debug
+    - $SBTPATH/sbt go-build android:package
@@ -1,6 +1,6 @@

-Copyright (C) 2016 by Max Lv <max.c.lv@gmail.com>
-Copyright (C) 2016 by Mygod Studio <contact-shadowsocks-android@mygod.be>
+Copyright (C) 2017 by Max Lv <max.c.lv@gmail.com>
+Copyright (C) 2017 by Mygod Studio <contact-shadowsocks-android@mygod.be>

 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
@@ -12,7 +12,6 @@ A [shadowsocks](http://shadowsocks.org) client for Android, written in Scala.

 * JDK 1.8
 * SBT 0.13.0+
-* Go 1.4+
 * Android SDK
  - Build Tools 25+
  - Android Support Repository and Google Repository (see `build.sbt` for version)
@@ -22,33 +21,45 @@ A [shadowsocks](http://shadowsocks.org) client for Android, written in Scala.

 * Set environment variable `ANDROID_HOME` to `/path/to/android-sdk`
 * Set environment variable `ANDROID_NDK_HOME` to `/path/to/android-ndk`
-* Set environment variable `GOROOT_BOOTSTRAP` to `/path/to/go`
 * Create your key following the instructions at https://developer.android.com/studio/publish/app-signing.html
-* Create `local.properties` from `local.properties.example` with your own key information
+* Create `mobile/local.properties` from `mobile/local.properties.example` with your own key information
 * Invoke the building like this

 ```bash
-    git submodule update --init
+    git submodule update --init --recursive

    # Build the App
-    sbt native-build clean android:package-release
+    sbt clean android:package-release
 ```

+### TRANSLATE
+
+Translators can go to [POEditor](https://poeditor.com/join/project/u5VHO9vhSf) to help translate shadowsocks-android. Guidelines:
+
+* It's okay to leave some strings untranslated if you think it should use the same string as English (US).
+* `faq_url` should not be changed. If you'd like to translate FAQ, submit a pull request with the translated [`faq.md`](https://github.com/shadowsocks/shadowsocks-android/blob/master/.github/faq.md) (it should be named properly, e.g. `.github/faq.zh-CN.md`). Administrators will take care of the rest.
+* Do not add/edit/remove comments.
+
 ## OPEN SOURCE LICENSES

-* shadowsocks-libev: [GPLv3](https://github.com/shadowsocks/shadowsocks-libev/blob/master/LICENSE)
-* tun2socks: [BSD](https://github.com/shadowsocks/badvpn/blob/shadowsocks-android/COPYING)
-* redsocks: [APL 2.0](https://github.com/shadowsocks/redsocks/blob/master/README)
-* OpenSSL: [OpenSSL](https://github.com/shadowsocks/openssl-android/blob/master/NOTICE)
-* pdnsd: [GPLv3](https://github.com/shadowsocks/shadowsocks-android/blob/master/src/main/jni/pdnsd/COPYING)
-* libev: [GPLv2](https://github.com/shadowsocks/shadowsocks-android/blob/master/src/main/jni/libev/LICENSE)
-* libevent: [BSD](https://github.com/shadowsocks/libevent/blob/master/LICENSE)
-* kcptun: [MIT](https://github.com/xtaci/kcptun)
+<ul>
+    <li>redsocks: <a href="https://github.com/shadowsocks/redsocks/blob/shadowsocks-android/README">APL 2.0</a></li>
+    <li>mbed TLS: <a href="https://github.com/ARMmbed/mbedtls/blob/development/LICENSE">APL 2.0</a></li>
+    <li>libevent: <a href="https://github.com/shadowsocks/shadowsocks-android/blob/master/src/main/jni/libevent/LICENSE">BSD</a></li>
+    <li>tun2socks: <a href="https://github.com/shadowsocks/badvpn/blob/shadowsocks-android/COPYING">BSD</a></li>
+    <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>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>
+</ul>

 ### LICENSE

-Copyright (C) 2016 by Max Lv <<max.c.lv@gmail.com>>  
-Copyright (C) 2016 by Mygod Studio <<contact-shadowsocks-android@mygod.be>>
+Copyright (C) 2017 by Max Lv <<max.c.lv@gmail.com>>  
+Copyright (C) 2017 by Mygod Studio <<contact-shadowsocks-android@mygod.be>>

 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
@@ -1,65 +1,45 @@
-scalaVersion := "2.11.8"
-dexMaxHeap := "4g"
+lazy val commonSettings = Seq(
+  scalaVersion := "2.11.8",
+  dexMaxHeap := "4g",

-enablePlugins(AndroidApp)
-android.useSupportVectors
+  organization := "com.github.shadowsocks",

-name := "shadowsocks"
-version := "3.4.0"
-versionCode := Some(172)
+  platformTarget := "android-25",

-platformTarget := "android-25"
+  compileOrder := CompileOrder.JavaThenScala,
+  javacOptions ++= "-source" :: "1.7" :: "-target" :: "1.7" :: Nil,
+  scalacOptions ++= "-target:jvm-1.7" :: "-Xexperimental" :: Nil,
+  ndkArgs := "-j" :: java.lang.Runtime.getRuntime.availableProcessors.toString :: Nil,

-compileOrder := CompileOrder.JavaThenScala
-javacOptions ++= "-source" :: "1.7" :: "-target" :: "1.7" :: Nil
-scalacOptions ++= "-target:jvm-1.7" :: "-Xexperimental" :: Nil
-ndkJavah := Seq()
-ndkBuild := Seq()
+  proguardVersion := "5.3.2",
+  proguardCache := Seq(),

-proguardVersion := "5.3.2"
-proguardCache := Seq()
-proguardOptions ++=
-  "-keep class com.github.shadowsocks.System { *; }" ::
-  "-dontwarn com.google.android.gms.internal.**" ::
-  "-dontwarn com.j256.ormlite.**" ::
-  "-dontwarn okio.**" ::
-  "-dontwarn org.xbill.**" ::
-  Nil
+  shrinkResources := true,
+  typedResources := false
+)

-shrinkResources := true
-typedResources := false
-resConfigs := Seq("ja", "ru", "zh-rCN", "zh-rTW")
+val supportLibsVersion = "25.2.0"
+lazy val root = Project(id = "shadowsocks-android", base = file("."))
+  .settings(commonSettings)
+  .aggregate(plugin, mobile)

-resolvers += Resolver.jcenterRepo
-libraryDependencies ++=
-  "com.android.support" % "cardview-v7" % "25.1.0" ::
-  "com.android.support" % "design" % "25.1.0" ::
-  "com.android.support" % "gridlayout-v7" % "25.1.0" ::
-  "com.android.support" % "preference-v14" % "25.1.0" ::
-  "com.evernote" % "android-job" % "1.1.3" ::
-  "com.github.jorgecastilloprz" % "fabprogresscircle" % "1.01" ::
-  "com.google.android.gms" % "play-services-ads" % "10.0.1" ::
-  "com.google.android.gms" % "play-services-analytics" % "10.0.1" ::
-  "com.google.android.gms" % "play-services-gcm" % "10.0.1" ::
-  "com.j256.ormlite" % "ormlite-android" % "5.0" ::
-  "com.mikepenz" % "crossfader" % "1.5.0" ::
-  "com.mikepenz" % "fastadapter" % "2.1.5" ::
-  "com.mikepenz" % "iconics-core" % "2.8.2" ::
-  "com.mikepenz" % "materialdrawer" % "5.8.1" ::
-  "com.mikepenz" % "materialize" % "1.0.0" ::
-  "com.squareup.okhttp3" % "okhttp" % "3.5.0" ::
-  "com.twofortyfouram" % "android-plugin-api-for-locale" % "1.0.2" ::
-  "dnsjava" % "dnsjava" % "2.1.7" ::
-  "eu.chainfire" % "libsuperuser" % "1.0.0.201608240809" ::
-  "com.google.zxing" % "android-integration" % "3.2.1" ::
-  "net.glxn.qrgen" % "android" % "2.0" ::
-  Nil
+install in Android := (install in (mobile, Android)).value
+run in Android := (run in (mobile, Android)).evaluated

-lazy val nativeBuild = TaskKey[Unit]("native-build", "Build native executables")
-nativeBuild := {
-  val logger = streams.value.log
-  Process("./build.sh") ! logger match {
-    case 0 => // Success!
-    case n => sys.error(s"Native build script exit code: $n")
-  }
-}
+lazy val plugin = project
+  .settings(commonSettings)
+  .settings(
+    libraryDependencies += "com.android.support" % "preference-v14" % supportLibsVersion
+  )
+
+lazy val mobile = project
+  .settings(commonSettings)
+  .settings(
+    libraryDependencies ++=
+      "com.android.support" % "cardview-v7" % supportLibsVersion ::
+      "com.android.support" % "customtabs" % supportLibsVersion ::
+      "com.android.support" % "design" % supportLibsVersion ::
+      "com.android.support" % "gridlayout-v7" % supportLibsVersion ::
+      Nil
+  )
+  .dependsOn(plugin)
@@ -1,28 +0,0 @@
-#!/bin/bash
-
-function try () {
-"$@" || exit -1
-}
-
-# Build native binaries
-pushd src/main
-try $ANDROID_NDK_HOME/ndk-build -j8
-
-rm -rf assets/armeabi-v7a
-rm -rf assets/x86
-mkdir -p assets/armeabi-v7a
-mkdir -p assets/x86
-
-#copy executables
-for app in pdnsd redsocks ss-local ss-tunnel tun2socks
-do
-    echo $app
-    try mv libs/armeabi-v7a/$app assets/armeabi-v7a/
-    try mv libs/x86/$app assets/x86/
-done
-popd
-
-# Build kcptun
-pushd kcptun
-try ./make.bash
-popd
@@ -1,69 +0,0 @@
-#!/bin/bash
-
-function try () {
-"$@" || exit -1
-}
-
-[ -z "$ANDROID_NDK_HOME" ] && ANDROID_NDK_HOME=~/android-ndk-r12b
-
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-DEPS=$DIR/.deps
-ANDROID_ARM_TOOLCHAIN=$DEPS/android-toolchain-16-arm
-ANDROID_X86_TOOLCHAIN=$DEPS/android-toolchain-16-x86
-
-ANDROID_ARM_CC=$ANDROID_ARM_TOOLCHAIN/bin/arm-linux-androideabi-gcc
-ANDROID_ARM_STRIP=$ANDROID_ARM_TOOLCHAIN/bin/arm-linux-androideabi-strip
-
-ANDROID_X86_CC=$ANDROID_X86_TOOLCHAIN/bin/i686-linux-android-gcc
-ANDROID_X86_STRIP=$ANDROID_X86_TOOLCHAIN/bin/i686-linux-android-strip
-
-
-if [ ! -d "$DEPS" ]; then
-    mkdir -p $DEPS 
-fi
-
-if [ ! -d "$ANDROID_ARM_TOOLCHAIN" ]; then
-    echo "Make standalone toolchain for ARM arch"
-    $ANDROID_NDK_HOME/build/tools/make_standalone_toolchain.py --arch arm \
-        --api 16 --install-dir $ANDROID_ARM_TOOLCHAIN
-fi
-
-if [ ! -d "$ANDROID_X86_TOOLCHAIN" ]; then
-    echo "Make standalone toolchain for X86 arch"
-    $ANDROID_NDK_HOME/build/tools/make_standalone_toolchain.py --arch x86 \
-        --api 16 --install-dir $ANDROID_X86_TOOLCHAIN
-fi
-
-if [ ! -d "$DIR/go/bin" ]; then
-    echo "Build the custom go"
-
-    pushd $DIR/go/src
-    try ./make.bash
-    popd
-fi
-
-export GOROOT=$DIR/go
-export GOPATH=$DEPS/gopath
-export GOBIN=$GOPATH/bin
-mkdir -p $GOBIN
-export PATH=$GOROOT/bin:$PATH
-
-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"
-try env CGO_ENABLED=1 CC=$ANDROID_ARM_CC GOOS=android GOARCH=arm GOARM=7 go build -ldflags="-s -w"
-try $ANDROID_ARM_STRIP client
-try mv client $DIR/../src/main/assets/armeabi-v7a/kcptun
-
-echo "Cross compile kcptun for x86"
-try env CGO_ENABLED=1 CC=$ANDROID_X86_CC GOOS=android GOARCH=386 go build -ldflags="-s -w"
-try $ANDROID_X86_STRIP client
-try mv client $DIR/../src/main/assets/x86/kcptun
-popd
-
-echo "Successfully build kcptun"
@@ -0,0 +1,46 @@
+enablePlugins(AndroidApp)
+android.useSupportVectors
+
+name := "shadowsocks"
+version := "4.1.0"
+versionCode := Some(180)
+
+proguardOptions ++=
+  "-keep class com.github.shadowsocks.JniHelper { *; }" ::
+  "-dontwarn com.google.android.gms.internal.**" ::
+  "-dontwarn com.j256.ormlite.**" ::
+  "-dontwarn okio.**" ::
+  "-dontwarn org.xbill.**" ::
+  Nil
+
+resConfigs := Seq("ja", "ru", "zh-rCN", "zh-rTW")
+
+val playServicesVersion = "10.2.0"
+resolvers += Resolver.jcenterRepo
+libraryDependencies ++=
+  "com.futuremind.recyclerfastscroll" % "fastscroll" % "0.2.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.7" ::
+  "com.mikepenz" % "iconics-core" % "2.8.2" ::
+  "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")
+  }
+}
@@ -2,14 +2,11 @@
          xmlns:tools="http://schemas.android.com/tools" package="com.github.shadowsocks">

    <uses-permission android:name="android.permission.INTERNET"/>
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
    <uses-permission android:name="android.permission.NFC" />

    <uses-feature android:name="android.hardware.touchscreen"
                  android:required="false"/>
-    <uses-feature android:name="android.hardware.camera"
-                  android:required="false"/>
    <uses-feature android:name="android.hardware.nfc"
                  android:required="false"/>
    <uses-feature android:name="android.software.leanback"
@@ -20,15 +17,10 @@
            android:targetSdkVersion="25"/>

    <application
-            android:allowBackup="true"
-            android:extractNativeLibs="false"
            android:name=".ShadowsocksApplication"
-            android:hardwareAccelerated="true"
            android:icon="@mipmap/ic_launcher"
-            android:roundIcon="@mipmap/ic_launcher"
            android:backupAgent=".ShadowsocksBackupAgent"
            android:label="@string/app_name"
-            android:theme="@style/Theme.Material"
            android:banner="@drawable/ic_start_connected">

        <meta-data android:name="com.google.android.gms.version"
@@ -152,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"
@@ -0,0 +1,8 @@
+package com.github.shadowsocks.aidl;
+
+interface IShadowsocksServiceCallback {
+  oneway void stateChanged(int state, String profileName, String msg);
+  oneway void trafficUpdated(int profileId, long txRate, long rxRate, long txTotal, long rxTotal);
+  // Traffic data has persisted to database, listener should refetch their data from database
+  oneway void trafficPersisted(int profileId);
+}
@@ -4780,6 +4780,7 @@
 ^(.*\.)?googlezip\.net$
 ^(.*\.)?gvt0\.com$
 ^(.*\.)?gvt1\.com$
+^(.*\.)?gvt2\.com$
 ^(.*\.)?gvt3\.com$
 ^(.*\.)?html5rocks\.com$
 ^(.*\.)?iam\.soy$
@@ -4794,6 +4794,7 @@
 ^(.*\.)?googlezip\.net$
 ^(.*\.)?gvt0\.com$
 ^(.*\.)?gvt1\.com$
+^(.*\.)?gvt2\.com$
 ^(.*\.)?gvt3\.com$
 ^(.*\.)?html5rocks\.com$
 ^(.*\.)?iam\.soy$
@@ -0,0 +1 @@
+127.0.0.1 localhost
@@ -274,8 +274,8 @@ img {
 </head>
 <body>
 <p>A <a href="http://shadowsocks.org">Shadowsocks</a> client for Android, written in Scala.</p>
-<p>Copyright (C) 2016 by Max Lv <a href="&#x6d;&#97;&#x69;&#108;&#116;&#111;&#x3a;&#x6d;&#97;x&#46;&#99;.&#108;&#118;&#x40;&#103;&#109;&#97;&#x69;&#108;&#46;&#x63;&#x6f;&#109;">&#x6d;&#97;&#x78;.&#x63;&#x2e;&#108;v&#64;&#x67;&#109;&#x61;&#x69;&#108;&#x2e;&#99;&#111;&#109;</a></p>
-<p>Copyright (C) 2016 by Mygod Studio <a href="contact-shadowsocks-android@mygod.be">contact-shadowsocks-android@mygod.be</a></p>
+<p>Copyright (C) 2017 by Max Lv <a href="&#x6d;&#97;&#x69;&#108;&#116;&#111;&#x3a;&#x6d;&#97;x&#46;&#99;.&#108;&#118;&#x40;&#103;&#109;&#97;&#x69;&#108;&#46;&#x63;&#x6f;&#109;">&#x6d;&#97;&#x78;.&#x63;&#x2e;&#108;v&#64;&#x67;&#109;&#x61;&#x69;&#108;&#x2e;&#99;&#111;&#109;</a></p>
+<p>Copyright (C) 2017 by Mygod Studio <a href="contact-shadowsocks-android@mygod.be">contact-shadowsocks-android@mygod.be</a></p>
 <p>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
@@ -289,14 +289,17 @@ along with this program. If not, see <a href="http://www.gnu.org/licenses/">http

 <h3>Open Source Licenses</h3>
 <ul>
-    <li>shadowsocks-libev: <a href="https://github.com/shadowsocks/shadowsocks-libev/blob/master/LICENSE">GPLv3</a></li>
-    <li>tun2socks: <a href="https://github.com/shadowsocks/badvpn/blob/shadowsocks-android/COPYING">BSD</a></li>
    <li>redsocks: <a href="https://github.com/shadowsocks/redsocks/blob/shadowsocks-android/README">APL 2.0</a></li>
-    <li>OpenSSL: <a href="https://github.com/shadowsocks/openssl-android/blob/master/NOTICE">OpenSSL</a></li>
-    <li>pdnsd: <a href="https://github.com/shadowsocks/shadowsocks-android/blob/master/src/main/jni/pdnsd/COPYING">GPLv3</a></li>
-    <li>libev: <a href="https://github.com/shadowsocks/libevent/blob/shadowsocks-android/LICENSE">GPLv2</a></li>
+    <li>mbed TLS: <a href="https://github.com/ARMmbed/mbedtls/blob/development/LICENSE">APL 2.0</a></li>
    <li>libevent: <a href="https://github.com/shadowsocks/shadowsocks-android/blob/master/src/main/jni/libevent/LICENSE">BSD</a></li>
-    <li>kcptun: <a href="https://github.com/xtaci/kcptun/commits/master/LICENSE.md">MIT</a></li>
+    <li>tun2socks: <a href="https://github.com/shadowsocks/badvpn/blob/shadowsocks-android/COPYING">BSD</a></li>
+    <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>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>
 </ul>

 </body>
@@ -38,13 +38,35 @@

 package com.github.shadowsocks;

-public class System {
-  static {
-    java.lang.System.loadLibrary("system");
-  }
+import android.os.Build;
+import android.system.ErrnoException;

-  public static native int exec(String cmd);
-  public static native String getABI();
-  public static native int sendfd(int fd, String path);
-  public static native void jniclose(int fd);
+public class JniHelper {
+    static {
+        System.loadLibrary("jni-helper");
+    }
+
+    @Deprecated // Use Process.destroy() since API 24
+    public static void sigtermCompat(Process process) throws Exception {
+        if (Build.VERSION.SDK_INT >= 24) throw new UnsupportedOperationException("Never call this method in OpenJDK!");
+        int errno = sigterm(process);
+        if (errno != 0) throw Build.VERSION.SDK_INT >= 21
+                ? 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);
 }
@@ -0,0 +1,155 @@
+package com.github.shadowsocks.utils;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.StringTokenizer;
+
+/**
+ * Commandline objects help handling command lines specifying processes to
+ * execute.
+ *
+ * The class can be used to define a command line as nested elements or as a
+ * helper to define a command line by an application.
+ * <p>
+ * <code>
+ * &lt;someelement&gt;<br>
+ * &nbsp;&nbsp;&lt;acommandline executable="/executable/to/run"&gt;<br>
+ * &nbsp;&nbsp;&nbsp;&nbsp;&lt;argument value="argument 1" /&gt;<br>
+ * &nbsp;&nbsp;&nbsp;&nbsp;&lt;argument line="argument_1 argument_2 argument_3" /&gt;<br>
+ * &nbsp;&nbsp;&nbsp;&nbsp;&lt;argument value="argument 4" /&gt;<br>
+ * &nbsp;&nbsp;&lt;/acommandline&gt;<br>
+ * &lt;/someelement&gt;<br>
+ * </code>
+ *
+ * Based on: https://github.com/apache/ant/blob/588ce1f/src/main/org/apache/tools/ant/types/Commandline.java
+ *
+ * Adds support for escape character '\'.
+ *
+ * @author Mygod
+ */
+public final class Commandline {
+    private Commandline() { }
+
+    /**
+     * Quote the parts of the given array in way that makes them
+     * usable as command line arguments.
+     * @param args the list of arguments to quote.
+     * @return empty string for null or no command, else every argument split
+     * by spaces and quoted by quoting rules.
+     */
+    public static String toString(Iterable<String> args) {
+        // empty path return empty string
+        if (args == null) {
+            return "";
+        }
+        // path containing one or more elements
+        final StringBuilder result = new StringBuilder();
+        for (String arg : args) {
+            if (result.length() > 0) result.append(' ');
+            for (int j = 0; j < arg.length(); ++j) {
+                char ch = arg.charAt(j);
+                switch (ch) {
+                    case ' ': case '\\': case '"': case '\'': result.append('\\');  // intentionally no break
+                    default: result.append(ch);
+                }
+            }
+        }
+        return result.toString();
+    }
+    /**
+     * Quote the parts of the given array in way that makes them
+     * usable as command line arguments.
+     * @param args the list of arguments to quote.
+     * @return empty string for null or no command, else every argument split
+     * by spaces and quoted by quoting rules.
+     */
+    public static String toString(String[] args) {
+        return toString(Arrays.asList(args));   // thanks to Java, arrays aren't iterable
+    }
+
+    /**
+     * Crack a command line.
+     * @param toProcess the command line to process.
+     * @return the command line broken into strings.
+     * An empty or null toProcess parameter results in a zero sized array.
+     */
+    public static String[] translateCommandline(String toProcess) {
+        if (toProcess == null || toProcess.length() == 0) {
+            //no command? no string
+            return new String[0];
+        }
+        // parse with a simple finite state machine
+
+        final int normal = 0;
+        final int inQuote = 1;
+        final int inDoubleQuote = 2;
+        int state = normal;
+        final StringTokenizer tok = new StringTokenizer(toProcess, "\\\"\' ", true);
+        final ArrayList<String> result = new ArrayList<>();
+        final StringBuilder current = new StringBuilder();
+        boolean lastTokenHasBeenQuoted = false;
+        boolean lastTokenIsSlash = false;
+
+        while (tok.hasMoreTokens()) {
+            String nextTok = tok.nextToken();
+            switch (state) {
+                case inQuote:
+                    if ("\'".equals(nextTok)) {
+                        lastTokenHasBeenQuoted = true;
+                        state = normal;
+                    } else {
+                        current.append(nextTok);
+                    }
+                    break;
+                case inDoubleQuote:
+                    if ("\"".equals(nextTok)) {
+                        if (lastTokenIsSlash) {
+                            current.append(nextTok);
+                            lastTokenIsSlash = false;
+                        } else {
+                            lastTokenHasBeenQuoted = true;
+                            state = normal;
+                        }
+                    } else if ("\\".equals(nextTok)) {
+                        if (lastTokenIsSlash) {
+                            current.append(nextTok);
+                            lastTokenIsSlash = false;
+                        } else lastTokenIsSlash = true;
+                    } else {
+                        if (lastTokenIsSlash) {
+                            current.append("\\");   // unescaped
+                            lastTokenIsSlash = false;
+                        }
+                        current.append(nextTok);
+                    }
+                    break;
+                default:
+                    if (lastTokenIsSlash) {
+                        current.append(nextTok);
+                        lastTokenIsSlash = false;
+                    } else if ("\\".equals(nextTok)) lastTokenIsSlash = true; else if ("\'".equals(nextTok)) {
+                        state = inQuote;
+                    } else if ("\"".equals(nextTok)) {
+                        state = inDoubleQuote;
+                    } else if (" ".equals(nextTok)) {
+                        if (lastTokenHasBeenQuoted || current.length() != 0) {
+                            result.add(current.toString());
+                            current.setLength(0);
+                        }
+                    } else {
+                        current.append(nextTok);
+                    }
+                    lastTokenHasBeenQuoted = false;
+                    break;
+            }
+        }
+        if (lastTokenHasBeenQuoted || current.length() != 0) {
+            result.add(current.toString());
+        }
+        if (state == inQuote || state == inDoubleQuote) {
+            throw new IllegalArgumentException("unbalanced quotes in " + toProcess);
+        }
+        if (lastTokenIsSlash) throw new IllegalArgumentException("escape character following nothing in " + toProcess);
+        return result.toArray(new String[result.size()]);
+    }
+}
@@ -16,6 +16,8 @@
 LOCAL_PATH := $(call my-dir)
 ROOT_PATH := $(LOCAL_PATH)

+BUILD_SHARED_EXECUTABLE := $(LOCAL_PATH)/build-shared-executable.mk
+
 ########################################################
 ## libsodium
 ########################################################
@@ -24,176 +26,37 @@ include $(CLEAR_VARS)

 SODIUM_SOURCE := \
 	crypto_aead/chacha20poly1305/sodium/aead_chacha20poly1305.c \
-	crypto_auth/crypto_auth.c \
-	crypto_auth/hmacsha256/auth_hmacsha256_api.c \
-	crypto_auth/hmacsha256/cp/hmac_hmacsha256.c \
-	crypto_auth/hmacsha256/cp/verify_hmacsha256.c \
-	crypto_auth/hmacsha512/auth_hmacsha512_api.c \
-	crypto_auth/hmacsha512/cp/hmac_hmacsha512.c \
-	crypto_auth/hmacsha512/cp/verify_hmacsha512.c \
-	crypto_auth/hmacsha512256/auth_hmacsha512256_api.c \
-	crypto_auth/hmacsha512256/cp/hmac_hmacsha512256.c \
-	crypto_auth/hmacsha512256/cp/verify_hmacsha512256.c \
-	crypto_box/crypto_box.c \
-	crypto_box/crypto_box_easy.c \
-	crypto_box/crypto_box_seal.c \
-	crypto_box/curve25519xsalsa20poly1305/box_curve25519xsalsa20poly1305_api.c \
-	crypto_box/curve25519xsalsa20poly1305/ref/after_curve25519xsalsa20poly1305.c \
-	crypto_box/curve25519xsalsa20poly1305/ref/before_curve25519xsalsa20poly1305.c \
-	crypto_box/curve25519xsalsa20poly1305/ref/box_curve25519xsalsa20poly1305.c \
-	crypto_box/curve25519xsalsa20poly1305/ref/keypair_curve25519xsalsa20poly1305.c \
-	crypto_core/hsalsa20/ref2/core_hsalsa20.c \
-	crypto_core/hsalsa20/core_hsalsa20_api.c \
 	crypto_core/salsa20/ref/core_salsa20.c \
-	crypto_core/salsa20/core_salsa20_api.c \
-	crypto_generichash/crypto_generichash.c \
-	crypto_generichash/blake2/generichash_blake2_api.c \
-	crypto_generichash/blake2/ref/blake2-impl.h \
-	crypto_generichash/blake2/ref/blake2.h \
 	crypto_generichash/blake2/ref/blake2b-compress-ref.c \
-	crypto_generichash/blake2/ref/blake2b-load-sse2.h \
-	crypto_generichash/blake2/ref/blake2b-load-sse41.h \
 	crypto_generichash/blake2/ref/blake2b-ref.c \
-	crypto_generichash/blake2/ref/blake2b-round.h \
 	crypto_generichash/blake2/ref/generichash_blake2b.c \
-	crypto_hash/crypto_hash.c \
-	crypto_hash/sha256/hash_sha256_api.c \
-	crypto_hash/sha256/cp/hash_sha256.c \
-	crypto_hash/sha512/hash_sha512_api.c \
-	crypto_hash/sha512/cp/hash_sha512.c \
-	crypto_onetimeauth/crypto_onetimeauth.c \
 	crypto_onetimeauth/poly1305/onetimeauth_poly1305.c \
-	crypto_onetimeauth/poly1305/onetimeauth_poly1305.h \
-	crypto_onetimeauth/poly1305/donna/poly1305_donna.h \
-	crypto_onetimeauth/poly1305/donna/poly1305_donna32.h \
-	crypto_onetimeauth/poly1305/donna/poly1305_donna64.h \
 	crypto_onetimeauth/poly1305/donna/poly1305_donna.c \
-	crypto_pwhash/scryptsalsa208sha256/crypto_scrypt-common.c \
-	crypto_pwhash/scryptsalsa208sha256/crypto_scrypt.h \
-	crypto_pwhash/scryptsalsa208sha256/scrypt_platform.c \
-	crypto_pwhash/scryptsalsa208sha256/pbkdf2-sha256.c \
-	crypto_pwhash/scryptsalsa208sha256/pbkdf2-sha256.h \
-	crypto_pwhash/scryptsalsa208sha256/pwhash_scryptsalsa208sha256.c \
-	crypto_pwhash/scryptsalsa208sha256/sysendian.h \
-	crypto_pwhash/scryptsalsa208sha256/nosse/pwhash_scryptsalsa208sha256_nosse.c \
-	crypto_scalarmult/crypto_scalarmult.c \
+	crypto_pwhash/crypto_pwhash.c \
+	crypto_pwhash/argon2/argon2-core.c \
+	crypto_pwhash/argon2/argon2.c \
+	crypto_pwhash/argon2/argon2-encoding.c \
+	crypto_pwhash/argon2/argon2-fill-block-ref.c \
+	crypto_pwhash/argon2/blake2b-long.c \
+	crypto_pwhash/argon2/pwhash_argon2i.c \
 	crypto_scalarmult/curve25519/scalarmult_curve25519.c \
-	crypto_scalarmult/curve25519/scalarmult_curve25519.h \
-	crypto_secretbox/crypto_secretbox.c \
-	crypto_secretbox/crypto_secretbox_easy.c \
-	crypto_secretbox/xsalsa20poly1305/secretbox_xsalsa20poly1305_api.c \
-	crypto_secretbox/xsalsa20poly1305/ref/box_xsalsa20poly1305.c \
-	crypto_shorthash/crypto_shorthash.c \
-	crypto_shorthash/siphash24/shorthash_siphash24_api.c \
-	crypto_shorthash/siphash24/ref/shorthash_siphash24.c \
-	crypto_sign/crypto_sign.c \
-	crypto_sign/ed25519/ref10/base.h \
-	crypto_sign/ed25519/ref10/base2.h \
-	crypto_sign/ed25519/sign_ed25519_api.c \
-	crypto_sign/ed25519/ref10/d.h \
-	crypto_sign/ed25519/ref10/d2.h \
-	crypto_sign/ed25519/ref10/fe.h \
-	crypto_sign/ed25519/ref10/fe_0.c \
-	crypto_sign/ed25519/ref10/fe_1.c \
-	crypto_sign/ed25519/ref10/fe_add.c \
-	crypto_sign/ed25519/ref10/fe_cmov.c \
-	crypto_sign/ed25519/ref10/fe_copy.c \
-	crypto_sign/ed25519/ref10/fe_frombytes.c \
-	crypto_sign/ed25519/ref10/fe_invert.c \
-	crypto_sign/ed25519/ref10/fe_isnegative.c \
-	crypto_sign/ed25519/ref10/fe_isnonzero.c \
-	crypto_sign/ed25519/ref10/fe_mul.c \
-	crypto_sign/ed25519/ref10/fe_neg.c \
-	crypto_sign/ed25519/ref10/fe_pow22523.c \
-	crypto_sign/ed25519/ref10/fe_sq.c \
-	crypto_sign/ed25519/ref10/fe_sq2.c \
-	crypto_sign/ed25519/ref10/fe_sub.c \
-	crypto_sign/ed25519/ref10/fe_tobytes.c \
-	crypto_sign/ed25519/ref10/ge.h \
-	crypto_sign/ed25519/ref10/ge_add.c \
-	crypto_sign/ed25519/ref10/ge_add.h \
-	crypto_sign/ed25519/ref10/ge_double_scalarmult.c \
-	crypto_sign/ed25519/ref10/ge_frombytes.c \
-	crypto_sign/ed25519/ref10/ge_madd.c \
-	crypto_sign/ed25519/ref10/ge_madd.h \
-	crypto_sign/ed25519/ref10/ge_msub.c \
-	crypto_sign/ed25519/ref10/ge_msub.h \
-	crypto_sign/ed25519/ref10/ge_p1p1_to_p2.c \
-	crypto_sign/ed25519/ref10/ge_p1p1_to_p3.c \
-	crypto_sign/ed25519/ref10/ge_p2_0.c \
-	crypto_sign/ed25519/ref10/ge_p2_dbl.c \
-	crypto_sign/ed25519/ref10/ge_p2_dbl.h \
-	crypto_sign/ed25519/ref10/ge_p3_0.c \
-	crypto_sign/ed25519/ref10/ge_p3_dbl.c \
-	crypto_sign/ed25519/ref10/ge_p3_to_cached.c \
-	crypto_sign/ed25519/ref10/ge_p3_to_p2.c \
-	crypto_sign/ed25519/ref10/ge_p3_tobytes.c \
-	crypto_sign/ed25519/ref10/ge_precomp_0.c \
-	crypto_sign/ed25519/ref10/ge_scalarmult_base.c \
-	crypto_sign/ed25519/ref10/ge_sub.c \
-	crypto_sign/ed25519/ref10/ge_sub.h \
-	crypto_sign/ed25519/ref10/ge_tobytes.c \
-	crypto_sign/ed25519/ref10/keypair.c \
-	crypto_sign/ed25519/ref10/open.c \
-	crypto_sign/ed25519/ref10/pow22523.h \
-	crypto_sign/ed25519/ref10/pow225521.h \
-	crypto_sign/ed25519/ref10/sc.h \
-	crypto_sign/ed25519/ref10/sc_muladd.c \
-	crypto_sign/ed25519/ref10/sc_reduce.c \
-	crypto_sign/ed25519/ref10/sign.c \
-	crypto_sign/ed25519/ref10/sqrtm1.h \
-	crypto_stream/crypto_stream.c \
 	crypto_stream/chacha20/stream_chacha20.c \
-	crypto_stream/chacha20/stream_chacha20.h \
-	crypto_stream/chacha20/ref/stream_chacha20_ref.h \
 	crypto_stream/chacha20/ref/stream_chacha20_ref.c \
-	crypto_stream/salsa20/stream_salsa20_api.c \
-	crypto_stream/xsalsa20/stream_xsalsa20_api.c \
-	crypto_stream/xsalsa20/ref/stream_xsalsa20.c \
-	crypto_stream/xsalsa20/ref/xor_xsalsa20.c \
-	crypto_verify/16/verify_16_api.c \
+	crypto_stream/salsa20/ref/stream_salsa20_ref.c \
+	crypto_stream/salsa20/ref/xor_salsa20_ref.c \
 	crypto_verify/16/ref/verify_16.c \
-	crypto_verify/32/verify_32_api.c \
-	crypto_verify/32/ref/verify_32.c \
-	crypto_verify/64/verify_64_api.c \
-	crypto_verify/64/ref/verify_64.c \
 	randombytes/randombytes.c \
+	randombytes/sysrandom/randombytes_sysrandom.c \
 	sodium/core.c \
 	sodium/runtime.c \
 	sodium/utils.c \
 	sodium/version.c

-SODIUM_SOURCE += \
-	crypto_scalarmult/curve25519/ref10/curve25519_ref10.c \
-	crypto_scalarmult/curve25519/ref10/curve25519_ref10.h \
-	crypto_scalarmult/curve25519/ref10/fe.h \
-	crypto_scalarmult/curve25519/ref10/fe_0_curve25519_ref10.c \
-	crypto_scalarmult/curve25519/ref10/fe_1_curve25519_ref10.c \
-	crypto_scalarmult/curve25519/ref10/fe_add_curve25519_ref10.c \
-	crypto_scalarmult/curve25519/ref10/fe_copy_curve25519_ref10.c \
-	crypto_scalarmult/curve25519/ref10/fe_cswap_curve25519_ref10.c \
-	crypto_scalarmult/curve25519/ref10/fe_frombytes_curve25519_ref10.c \
-	crypto_scalarmult/curve25519/ref10/fe_invert_curve25519_ref10.c \
-	crypto_scalarmult/curve25519/ref10/fe_mul_curve25519_ref10.c \
-	crypto_scalarmult/curve25519/ref10/fe_mul121666_curve25519_ref10.c \
-	crypto_scalarmult/curve25519/ref10/fe_sq_curve25519_ref10.c \
-	crypto_scalarmult/curve25519/ref10/fe_sub_curve25519_ref10.c \
-	crypto_scalarmult/curve25519/ref10/fe_tobytes_curve25519_ref10.c \
-	crypto_scalarmult/curve25519/ref10/montgomery.h \
-	crypto_scalarmult/curve25519/ref10/pow225521.h
-
-SODIUM_SOURCE += \
-	crypto_stream/salsa20/ref/stream_salsa20_ref.c \
-	crypto_stream/salsa20/ref/xor_salsa20_ref.c
-
-SODIUM_SOURCE += \
-	randombytes/sysrandom/randombytes_sysrandom.c
-
 LOCAL_MODULE := sodium
-LOCAL_CFLAGS += -O2 -I$(LOCAL_PATH)/shadowsocks-libev/libsodium/src/libsodium/include \
+LOCAL_CFLAGS += -O2 -I$(LOCAL_PATH)/libsodium/src/libsodium/include \
 				-I$(LOCAL_PATH)/include \
 				-I$(LOCAL_PATH)/include/sodium \
-				-I$(LOCAL_PATH)/shadowsocks-libev/libsodium/src/libsodium/include/sodium \
+				-I$(LOCAL_PATH)/libsodium/src/libsodium/include/sodium \
 				-DPACKAGE_NAME=\"libsodium\" -DPACKAGE_TARNAME=\"libsodium\" \
 				-DPACKAGE_VERSION=\"1.0.7\" -DPACKAGE_STRING=\"libsodium\ 1.0.7\" \
 				-DPACKAGE_BUGREPORT=\"https://github.com/jedisct1/libsodium/issues\" \
@@ -209,7 +72,7 @@ LOCAL_CFLAGS += -O2 -I$(LOCAL_PATH)/shadowsocks-libev/libsodium/src/libsodium/in
 				-DHAVE_WEAK_SYMBOLS=1 -DHAVE_ARC4RANDOM=1 -DHAVE_ARC4RANDOM_BUF=1 \
 				-DHAVE_MLOCK=1 -DHAVE_MPROTECT=1 -DHAVE_POSIX_MEMALIGN=1

-LOCAL_SRC_FILES := $(addprefix shadowsocks-libev/libsodium/src/libsodium/,$(SODIUM_SOURCE))
+LOCAL_SRC_FILES := $(addprefix libsodium/src/libsodium/,$(SODIUM_SOURCE))

 include $(BUILD_STATIC_LIBRARY)

@@ -254,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
 ########################################################
@@ -273,7 +152,7 @@ LOCAL_MODULE := libipset
 LOCAL_CFLAGS += -O2 -I$(LOCAL_PATH)/shadowsocks-libev/libipset/include \
 				-I$(LOCAL_PATH)/shadowsocks-libev/libcork/include

-LOCAL_SRC_FILES := $(addprefix shadowsocks-libev/libipset/,$(IPSET_SOURCE))
+LOCAL_SRC_FILES := $(addprefix shadowsocks-libev/libipset/src/libipset/,$(IPSET_SOURCE))

 include $(BUILD_STATIC_LIBRARY)

@@ -300,7 +179,7 @@ LOCAL_MODULE := libcork
 LOCAL_CFLAGS += -O2 -I$(LOCAL_PATH)/shadowsocks-libev/libcork/include \
 				-DCORK_API=CORK_LOCAL

-LOCAL_SRC_FILES := $(addprefix shadowsocks-libev/libcork/,$(CORK_SOURCE))
+LOCAL_SRC_FILES := $(addprefix shadowsocks-libev/libcork/src/libcork/,$(CORK_SOURCE))

 include $(BUILD_STATIC_LIBRARY)

@@ -316,10 +195,10 @@ UDNS_SOURCES := udns_dn.c udns_dntosp.c udns_parse.c udns_resolver.c udns_init.c
 	udns_rr_srv.c udns_rr_naptr.c udns_codes.c udns_jran.c

 LOCAL_MODULE := libudns
-LOCAL_CFLAGS += -O2 -I$(LOCAL_PATH)/shadowsocks-libev/libudns \
+LOCAL_CFLAGS += -O2 -I$(LOCAL_PATH)/libudns \
 				-DHAVE_DECL_INET_NTOP

-LOCAL_SRC_FILES := $(addprefix shadowsocks-libev/libudns/,$(UDNS_SOURCES))
+LOCAL_SRC_FILES := $(addprefix libudns/,$(UDNS_SOURCES))

 include $(BUILD_STATIC_LIBRARY)

@@ -333,8 +212,8 @@ LOCAL_MODULE := libev
 LOCAL_CFLAGS += -O2 -DNDEBUG -DHAVE_CONFIG_H \
 				-I$(LOCAL_PATH)/include/libev
 LOCAL_SRC_FILES := \
-	shadowsocks-libev/libev/ev.c \
-	shadowsocks-libev/libev/event.c 
+	libev/ev.c \
+	libev/event.c 

 include $(BUILD_STATIC_LIBRARY)

@@ -358,24 +237,7 @@ LOCAL_CFLAGS := -O2 -std=gnu99 -DUSE_IPTABLES \
 	-I$(LOCAL_PATH)/libevent/include \
 	-I$(LOCAL_PATH)/libevent

-include $(BUILD_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_EXECUTABLE)
+include $(BUILD_SHARED_EXECUTABLE)

 ########################################################
 ## shadowsocks-libev local
@@ -383,8 +245,11 @@ 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 http.c tls.c rule.c \
+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 ppbloom.c \
 	android.c

 LOCAL_MODULE    := ss-local
@@ -397,19 +262,20 @@ LOCAL_CFLAGS    := -Wall -O2 -fno-strict-aliasing -DMODULE_LOCAL \
 					-I$(LOCAL_PATH)/libancillary \
 					-I$(LOCAL_PATH)/mbedtls/include  \
 					-I$(LOCAL_PATH)/pcre \
-					-I$(LOCAL_PATH)/shadowsocks-libev/libudns \
+					-I$(LOCAL_PATH)/libudns \
+					-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/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)/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

-include $(BUILD_EXECUTABLE)
+include $(BUILD_SHARED_EXECUTABLE)

 ########################################################
 ## shadowsocks-libev tunnel
@@ -417,7 +283,11 @@ include $(BUILD_EXECUTABLE)

 include $(CLEAR_VARS)

-SHADOWSOCKS_SOURCES := tunnel.c cache.c udprelay.c encrypt.c utils.c netutils.c json.c jconf.c android.c
+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 ppbloom.c \
+	android.c

 LOCAL_MODULE    := ss-tunnel
 LOCAL_SRC_FILES := $(addprefix shadowsocks-libev/src/, $(SHADOWSOCKS_SOURCES))
@@ -426,31 +296,32 @@ LOCAL_CFLAGS    := -Wall -O2 -fno-strict-aliasing -DMODULE_TUNNEL \
 					-DCONNECT_IN_PROGRESS=EINPROGRESS \
 					-I$(LOCAL_PATH)/libancillary \
 					-I$(LOCAL_PATH)/include \
-					-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)/libudns \
+					-I$(LOCAL_PATH)/libsodium/src/libsodium/include \
+					-I$(LOCAL_PATH)/libsodium/src/libsodium/include/sodium \
 					-I$(LOCAL_PATH)/mbedtls/include \
-					-I$(LOCAL_PATH)/shadowsocks-libev/libev \
+					-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

-include $(BUILD_EXECUTABLE)
+include $(BUILD_SHARED_EXECUTABLE)

 ########################################################
-## system
+## jni-helper
 ########################################################

 include $(CLEAR_VARS)

-LOCAL_MODULE:= system
+LOCAL_MODULE:= jni-helper

 LOCAL_C_INCLUDES:= $(LOCAL_PATH)/libancillary

-LOCAL_SRC_FILES:= system.cpp
+LOCAL_SRC_FILES:= jni-helper.cpp

 LOCAL_LDLIBS := -ldl -llog

@@ -549,7 +420,7 @@ LOCAL_LDLIBS := -ldl -llog

 LOCAL_SRC_FILES := $(addprefix badvpn/, $(TUN2SOCKS_SOURCES))

-include $(BUILD_EXECUTABLE)
+include $(BUILD_SHARED_EXECUTABLE)

 ########################################################
 ## mbed TLS 
@@ -573,7 +444,7 @@ include $(BUILD_STATIC_LIBRARY)

 include $(CLEAR_VARS)

-LOCAL_MODULE := pcre 
+LOCAL_MODULE := pcre

 LOCAL_CFLAGS += -DHAVE_CONFIG_H

@@ -606,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)

@@ -1,4 +1,4 @@
 APP_ABI      			:= armeabi-v7a x86
-APP_PLATFORM 			:= android-16
+APP_PLATFORM 			:= android-19
 APP_STL      			:= stlport_static
 NDK_TOOLCHAIN_VERSION 	:= clang
@@ -0,0 +1,31 @@
+# Copyright (C) 2009 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# this file is included from Android.mk files to build a target-specific
+# executable program
+#
+# Modified by @Mygod, based on:
+#   https://android.googlesource.com/platform/ndk/+/f2e98f8c066aed59caf61163d4b87c2b858f9814/build/core/build-shared-library.mk
+#   https://android.googlesource.com/platform/ndk/+/f2e98f8c066aed59caf61163d4b87c2b858f9814/build/core/build-executable.mk
+LOCAL_BUILD_SCRIPT := BUILD_EXECUTABLE
+LOCAL_MAKEFILE     := $(local-makefile)
+$(call check-defined-LOCAL_MODULE,$(LOCAL_BUILD_SCRIPT))
+$(call check-LOCAL_MODULE,$(LOCAL_MAKEFILE))
+$(call check-LOCAL_MODULE_FILENAME)
+# we are building target objects
+my := TARGET_
+$(call handle-module-filename,lib,$(TARGET_SONAME_EXTENSION))
+$(call handle-module-built)
+LOCAL_MODULE_CLASS := EXECUTABLE
+include $(BUILD_SYSTEM)/build-module.mk
@@ -0,0 +1,198 @@
+#define LOG_TAG "JniHelper"
+
+#include "jni.h"
+#include <android/log.h>
+#include <sys/system_properties.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <errno.h>
+#include <signal.h>
+
+#include <sys/un.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <ancillary.h>
+
+#define LOGI(...) do { __android_log_print(ANDROID_LOG_INFO, LOG_TAG, __VA_ARGS__); } while(0)
+#define LOGW(...) do { __android_log_print(ANDROID_LOG_WARN, LOG_TAG, __VA_ARGS__); } while(0)
+#define LOGE(...) do { __android_log_print(ANDROID_LOG_ERROR, LOG_TAG, __VA_ARGS__); } while(0)
+#define THROW(env, clazz, msg) do { env->ThrowNew(env->FindClass(clazz), msg); } while (0)
+
+static jclass ProcessImpl;
+static jfieldID ProcessImpl_pid, ProcessImpl_exitValue, ProcessImpl_exitValueMutex;
+
+static int sdk_version() {
+    char version[PROP_VALUE_MAX + 1];
+    __system_property_get("ro.build.version.sdk", version);
+    return atoi(version);
+}
+
+jint Java_com_github_shadowsocks_jnihelper_sigterm(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 -1;
+    }
+    jint pid = env->GetIntField(process, ProcessImpl_pid);
+    // Suppress "No such process" errors. We just want the process killed. It's fine if it's already killed.
+    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);
+}
+
+jint Java_com_github_shadowsocks_jnihelper_sendfd(JNIEnv *env, jobject thiz, jint tun_fd, jstring path) {
+    int fd;
+    struct sockaddr_un addr;
+    const char *sock_str  = env->GetStringUTFChars(path, 0);
+
+    if ( (fd = socket(AF_UNIX, SOCK_STREAM, 0)) == -1) {
+        LOGE("socket() failed: %s (socket fd = %d)\n", strerror(errno), fd);
+        return (jint)-1;
+    }
+
+    memset(&addr, 0, sizeof(addr));
+    addr.sun_family = AF_UNIX;
+    strncpy(addr.sun_path, sock_str, sizeof(addr.sun_path)-1);
+
+    if (connect(fd, (struct sockaddr*)&addr, sizeof(addr)) == -1) {
+        LOGE("connect() failed: %s (fd = %d)\n", strerror(errno), fd);
+        close(fd);
+        return (jint)-1;
+    }
+
+    if (ancil_send_fd(fd, tun_fd)) {
+        LOGE("ancil_send_fd: %s", strerror(errno));
+        close(fd);
+        return (jint)-1;
+    }
+
+    close(fd);
+    env->ReleaseStringUTFChars(path, sock_str);
+    return 0;
+}
+
+static const char *classPathName = "com/github/shadowsocks/JniHelper";
+
+static JNINativeMethod method_table[] = {
+    { "close", "(I)V",
+        (void*) Java_com_github_shadowsocks_jnihelper_close },
+    { "sendFd", "(ILjava/lang/String;)I",
+        (void*) Java_com_github_shadowsocks_jnihelper_sendfd },
+    { "sigterm", "(Ljava/lang/Process;)I",
+        (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.
+ */
+static int registerNativeMethods(JNIEnv* env, const char* className,
+    JNINativeMethod* gMethods, int numMethods)
+{
+    jclass clazz;
+
+    clazz = env->FindClass(className);
+    if (clazz == NULL) {
+        LOGE("Native registration unable to find class '%s'", className);
+        return JNI_FALSE;
+    }
+    if (env->RegisterNatives(clazz, gMethods, numMethods) < 0) {
+        LOGE("RegisterNatives failed for '%s'", className);
+        return JNI_FALSE;
+    }
+
+    return JNI_TRUE;
+}
+
+/*
+ * Register native methods for all classes we know about.
+ *
+ * returns JNI_TRUE on success.
+ */
+static int registerNatives(JNIEnv* env)
+{
+  if (!registerNativeMethods(env, classPathName, method_table,
+                 sizeof(method_table) / sizeof(method_table[0]))) {
+    return JNI_FALSE;
+  }
+
+  return JNI_TRUE;
+}
+
+/*
+ * This is called by the VM when the shared library is first loaded.
+ */
+
+typedef union {
+    JNIEnv* env;
+    void* venv;
+} UnionJNIEnvToVoid;
+
+jint JNI_OnLoad(JavaVM* vm, void* reserved) {
+    UnionJNIEnvToVoid uenv;
+    uenv.venv = NULL;
+    jint result = -1;
+    JNIEnv* env = NULL;
+
+    if (vm->GetEnv(&uenv.venv, JNI_VERSION_1_6) != JNI_OK) {
+        THROW(env, "java/lang/RuntimeException", "GetEnv failed");
+        goto bail;
+    }
+    env = uenv.env;
+
+    if (registerNatives(env) != JNI_TRUE) {
+        THROW(env, "java/lang/RuntimeException", "registerNativeMethods failed");
+        goto bail;
+    }
+
+    if (sdk_version() < 24) {
+        if (!(ProcessImpl = env->FindClass("java/lang/ProcessManager$ProcessImpl"))) {
+            THROW(env, "java/lang/RuntimeException", "ProcessManager$ProcessImpl not found");
+            goto bail;
+        }
+        ProcessImpl = (jclass) env->NewGlobalRef((jobject) ProcessImpl);
+        if (!(ProcessImpl_pid = env->GetFieldID(ProcessImpl, "pid", "I"))) {
+            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;
+
+bail:
+    return result;
+}
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android" android:color="?android:colorControlHighlight">
+    <item>
+        <selector android:enterFadeDuration="@android:integer/config_mediumAnimTime"
+                  android:exitFadeDuration="@android:integer/config_mediumAnimTime">
+            <item android:state_selected="true">
+                <color android:color="@color/material_primary_100"/>
+            </item>
+        </selector>
+    </item>
+</ripple>
@@ -6,6 +6,17 @@
            <corners android:radius="4dp"/>
        </shape>
    </item>
+    <item>
+        <selector android:enterFadeDuration="@android:integer/config_mediumAnimTime"
+                  android:exitFadeDuration="@android:integer/config_mediumAnimTime">
+            <item android:state_selected="true">
+                <shape android:shape="rectangle">
+                    <solid android:color="@color/material_green_700" />
+                    <corners android:radius="4dp"/>
+                </shape>
+            </item>
+        </selector>
+    </item>
    <item android:left="8dp">
        <shape android:shape="rectangle">
            <solid android:color="@android:color/white" />
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android"
+          android:enterFadeDuration="@android:integer/config_mediumAnimTime"
+          android:exitFadeDuration="@android:integer/config_mediumAnimTime">
+    <item android:state_selected="true">
+        <color android:color="@color/material_primary_100"/>
+    </item>
+</selector>
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M19,3h-4.18C14.4,1.84 13.3,1 12,1c-1.3,0 -2.4,0.84 -2.82,2L5,3c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2zM12,3c0.55,0 1,0.45 1,1s-0.45,1 -1,1 -1,-0.45 -1,-1 0.45,-1 1,-1zM14,17L7,17v-2h7v2zM17,13L7,13v-2h10v2zM17,9L7,9L7,7h10v2z"/>
+</vector>
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M11,18h2v-2h-2v2zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8zM12,6c-2.21,0 -4,1.79 -4,4h2c0,-1.1 0.9,-2 2,-2s2,0.9 2,2c0,2 -3,1.75 -3,5h2c0,-2.25 3,-2.5 3,-5 0,-2.21 -1.79,-4 -4,-4z"/>
+</vector>
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M14,10L2,10v2h12v-2zM14,6L2,6v2h12L14,6zM18,14v-4h-2v4h-4v2h4v4h2v-4h4v-2h-4zM2,16h8v-2L2,14v2z"/>
+</vector>
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:orientation="vertical"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent">
+    <Spinner android:id="@+id/template_selector"
+             android:layout_width="match_parent"
+             android:layout_height="wrap_content"
+             android:entries="@array/acl_rule_templates"/>
+    <EditText android:id="@+id/content"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:inputType="textNoSuggestions|textMultiLine"/>
+</LinearLayout>
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:background="?android:attr/selectableItemBackground"
+              android:paddingStart="12dp"
+              android:paddingEnd="12dp">
+    <ImageView android:id="@android:id/icon"
+               android:layout_width="52dp"
+               android:layout_height="52dp"/>
+    <Space android:layout_width="4dp"
+           android:layout_height="wrap_content"/>
+    <LinearLayout android:orientation="vertical"
+                  android:layout_width="0dp"
+                  android:layout_height="wrap_content"
+                  android:layout_weight="1"
+                  android:layout_gravity="center_vertical">
+        <TextView android:id="@android:id/text1"
+                  android:textAppearance="?android:attr/textAppearance"
+                  android:textColor="@android:color/primary_text_light"
+                  android:layout_width="match_parent"
+                  android:layout_height="wrap_content"
+                  android:maxLines="2"
+                  android:ellipsize="end"/>
+        <TextView android:id="@android:id/text2"
+                  android:textAppearance="?android:attr/textAppearanceSmall"
+                  android:layout_width="match_parent"
+                  android:layout_height="wrap_content"
+                  android:maxLines="2"
+                  android:ellipsize="end"/>
+    </LinearLayout>
+</LinearLayout>
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="fill_parent"
    android:layout_height="fill_parent"
@@ -19,24 +20,22 @@
            android:textSize="18sp"
            android:textColor="?android:attr/textColorSecondary"
            android:paddingStart="60dp"
-            android:paddingEnd="8dp"
+            android:paddingEnd="16dp"
            android:paddingTop="12dp"
            android:paddingBottom="12dp"
            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            tools:ignore="RtlHardcoded"/>
+            android:layout_height="wrap_content"/>
    <Switch android:checked="true"
            android:id="@+id/bypassSwitch"
            android:text="@string/bypass_apps"
            android:textSize="18sp"
            android:textColor="?android:attr/textColorSecondary"
            android:paddingStart="60dp"
-            android:paddingEnd="8dp"
+            android:paddingEnd="16dp"
            android:paddingTop="12dp"
            android:paddingBottom="12dp"
            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            tools:ignore="RtlHardcoded"/>
+            android:layout_height="wrap_content"/>
  </LinearLayout>
  <FrameLayout android:layout_width="fill_parent"
               android:layout_height="0dp"
@@ -48,7 +47,19 @@
    <android.support.v7.widget.RecyclerView
            android:layout_width="fill_parent"
            android:layout_height="fill_parent"
-            android:id="@+id/applistview"
+            android:id="@+id/list"
            android:visibility="gone"/>
+    <com.futuremind.recyclerviewfastscroll.FastScroller
+            android:id="@+id/fastscroller"
+            android:orientation="vertical"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_gravity="end"
+            android:layout_marginTop="8dp"
+            android:layout_marginBottom="8dp"
+            android:visibility="gone"
+            app:fastscroll__handleColor="@color/material_primary_500"
+            app:fastscroll__bubbleColor="@color/material_primary_500"
+            app:fastscroll__bubbleTextAppearance="@style/StyledScrollerTextAppearance"/>
  </FrameLayout>
 </LinearLayout>
@@ -28,6 +28,6 @@
        android:focusable="false"
        android:focusableInTouchMode="false"
        android:clickable="false"
-        android:layout_marginEnd="8dp"/>
+        android:layout_marginEnd="16dp"/>

 </LinearLayout>
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              xmlns:app="http://schemas.android.com/apk/res-auto"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:orientation="vertical">
+    <include layout="@layout/toolbar_light_dark"/>
+    <FrameLayout android:layout_width="match_parent"
+                 android:layout_height="0dp"
+                 android:layout_weight="1">
+        <android.support.v7.widget.RecyclerView android:id="@+id/list"
+                                                android:layout_width="match_parent"
+                                                android:layout_height="match_parent"
+                                                android:paddingBottom="32dp"
+                                                android:clipToPadding="false"/>
+        <com.futuremind.recyclerviewfastscroll.FastScroller
+                android:id="@+id/fastscroller"
+                android:orientation="vertical"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_gravity="end"
+                android:layout_marginTop="8dp"
+                android:layout_marginBottom="32dp"
+                app:fastscroll__handleColor="@color/material_primary_500"
+                app:fastscroll__bubbleColor="@color/material_primary_500"
+                app:fastscroll__bubbleTextAppearance="@style/StyledScrollerTextAppearance"/>
+    </FrameLayout>
+</LinearLayout>
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
+    android:layout_width="match_parent"
    android:layout_height="wrap_content">
    <ImageView android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:orientation="vertical"
        android:adjustViewBounds="true"
-        android:scaleType="fitCenter"
+        android:scaleType="centerCrop"
        android:src="@drawable/background_header"/>

    <TextView xmlns:android="http://schemas.android.com/apk/res/android"
@@ -4,12 +4,12 @@
              android:layout_height="match_parent"
              android:orientation="vertical">
    <include layout="@layout/toolbar_light_dark"/>
-    <android.support.v7.widget.RecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
-                                            android:id="@+id/profilesList"
+    <android.support.v7.widget.RecyclerView android:id="@+id/list"
                                            android:layout_width="match_parent"
                                            android:layout_height="0dp"
                                            android:layout_weight="1"
                                            android:paddingBottom="32dp"
+                                            android:scrollbars="vertical"
                                            android:clipChildren="false"
                                            android:clipToPadding="false"/>
 </LinearLayout>
@@ -6,7 +6,6 @@
             android:layout_height="wrap_content">
    <com.github.shadowsocks.widget.BoundedCardView android:layout_width="match_parent"
                                                   android:layout_height="wrap_content"
-                                                   android:background="@drawable/background_selectable"
                                                   android:layout_marginTop="8dp"
                                                   android:layout_marginStart="8dp"
                                                   android:layout_marginEnd="8dp"
@@ -25,7 +24,7 @@
                android:layout_height="wrap_content"
                android:layout_marginStart="8dp"
                android:id="@+id/container">
-                <TextView android:id="@+id/title"
+                <TextView android:id="@android:id/text1"
                    android:layout_width="0dp"
                    android:layout_height="wrap_content"
                    android:layout_gravity="center_vertical"
@@ -55,28 +54,29 @@
                    android:contentDescription="@string/edit"
                    android:focusable="true"/>
            </LinearLayout>
-            <LinearLayout android:layout_width="match_parent"
+            <RelativeLayout android:layout_width="match_parent"
                android:layout_height="wrap_content"
                android:layout_marginStart="8dp"
-                android:layout_marginTop="4dp"
-                android:id="@+id/details">
-                <TextView android:id="@+id/address"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:gravity="top"
-                    android:layout_weight="1"
-                    android:maxLines="2"
-                    android:ellipsize="end"
-                    android:textAppearance="?android:attr/textAppearanceSmall"
-                    android:textColor="?android:attr/textColorSecondary"/>
+                android:layout_marginTop="4dp">
+                <TextView android:id="@android:id/text2"
+                          android:layout_width="wrap_content"
+                          android:layout_height="wrap_content"
+                          android:layout_alignParentStart="true"
+                          android:layout_toStartOf="@+id/traffic"
+                          android:layout_marginEnd="8dp"
+                          android:maxLines="2"
+                          android:ellipsize="end"
+                          android:textAppearance="?android:attr/textAppearanceSmall"
+                          android:textColor="?android:attr/textColorSecondary"/>
                <TextView android:id="@+id/traffic"
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
-                    android:gravity="top"
+                    android:layout_gravity="bottom"
+                    android:layout_alignParentEnd="true"
                    android:ellipsize="end"
                    android:textAppearance="?android:attr/textAppearanceSmall"
                    android:textColor="?android:attr/textColorSecondary"/>
-            </LinearLayout>
+            </RelativeLayout>
        </LinearLayout>
    </com.github.shadowsocks.widget.BoundedCardView>
 </FrameLayout>
@@ -15,7 +15,8 @@
                android:textSize="18sp"
                android:padding="16dp"/>
    </FrameLayout>
-    <android.support.v7.widget.RecyclerView android:id="@+id/profilesList"
+    <android.support.v7.widget.RecyclerView android:id="@+id/list"
                                            android:layout_width="match_parent"
-                                            android:layout_height="match_parent" />
+                                            android:layout_height="match_parent"
+                                            android:scrollbars="vertical"/>
 </LinearLayout>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Max Lv	96320896aa	Update licenses	2017-03-02 14:53:53 +08:00
Max Lv	54efe36ffc	Add missing -V option	2017-03-02 09:28:12 +08:00
Max Lv	d5d6740a5a	Fix typos	2017-03-02 09:22:40 +08:00
Mygod	2e69eafdf8	Refine timeout for getting external IP	2017-03-01 22:49:10 +08:00
Mygod	86773085c3	Wait for process to terminate with a better way Refine #1122.	2017-03-01 22:28:35 +08:00
Mygod	b6667b9e0f	Use more readable variable name	2017-03-01 17:25:23 +08:00
Max Lv	0ee7e9d40e	Build overture from source code	2017-03-01 16:39:04 +08:00
Mygod	5f2ce1804f	Refine Overture configuration generation * Respect remoteDns settings more; * Make code more readable; * Handle illegal characters in remoteDns.	2017-03-01 16:08:19 +08:00
Mygod	a5e316999a	Update dependencies	2017-03-01 15:30:03 +08:00
Max Lv	64a3d75ba2	Update shadowsocks-libev	2017-03-01 12:02:36 +08:00
Max Lv	9d09c9a097	Bump version	2017-03-01 09:59:00 +08:00
Max Lv	b78f48504f	Merge branch 'develop' into beta	2017-03-01 09:57:45 +08:00
Max Lv	a61b03c86c	Add 600ms timeout for waitpid	2017-03-01 09:53:35 +08:00
Max Lv	f43362fb18	Fix overture with NAT mode	2017-02-25 16:58:31 +08:00
Max Lv	4f0e527df7	Replace PDNSD with overture	2017-02-24 21:00:40 +08:00
Max Lv	a8878298cc	Bump version	2017-02-24 19:44:46 +08:00
Max Lv	890be54403	Bump version	2017-02-24 19:36:44 +08:00
Max Lv	31984d1001	Add prebuilt overture libraries	2017-02-24 17:51:06 +08:00
Mygod	f30c31ae3e	Bump plugin lib version	2017-02-23 14:56:23 +08:00
Mygod	05963b6c82	Update support library	2017-02-23 14:55:32 +08:00
Mygod	98da4cd6e5	Update dependencies	2017-02-23 14:55:07 +08:00
Max Lv	64da35c59b	Update shadowsocks-libev	2017-02-22 14:56:31 +08:00
Max Lv	458a3473b1	Trim remoteDns	2017-02-17 20:13:13 +08:00
Max Lv	66db347215	Fix #1130	2017-02-17 19:14:33 +08:00
Max Lv	f9e32c995b	Update shadowsocks-libev	2017-02-17 13:36:41 +08:00
Max Lv	0626ce8787	Fix a memory leak	2017-02-17 12:35:15 +08:00
Max Lv	11d827c6ba	Bump version	2017-02-13 09:29:11 +08:00
Max Lv	dc46cd971a	Merge branch 'beta'	2017-02-13 09:21:18 +08:00
Max Lv	876e92f275	Bump version	2017-02-13 09:17:59 +08:00
Max Lv	41747c976b	Update shadowsocks-libev	2017-02-12 20:24:56 +08:00
Max Lv	8277b07d24	Bump version	2017-02-10 10:16:27 +08:00
Max Lv	b982867130	Merge branch 'beta'	2017-02-10 10:05:18 +08:00
Max Lv	491710679a	Fix #1111	2017-02-09 10:50:44 +08:00
Max Lv	24c6aca85c	Add remote DNS to route	2017-02-09 10:02:02 +08:00
Mygod	293e9b5dff	Fix equals missing in Subnet	2017-02-08 18:47:53 +08:00
Mygod	3ac77e1f8d	Fix crash on back pressed after MainActivity recreated	2017-02-08 18:47:23 +08:00
Mygod	fd2c67d0b8	Add missing file	2017-02-08 17:19:22 +08:00
Mygod	684698c8e4	Refine URLs	2017-02-08 17:18:04 +08:00
Mygod	6a02d4b985	Add change log to plugin library	2017-02-08 17:13:17 +08:00
Mygod	7219ce429c	Bump version	2017-02-08 17:07:56 +08:00
Max Lv	9975b135d0	Remove chacha20-poly1305	2017-02-08 12:19:51 +08:00
Max Lv	5d46ef45e3	Bump version	2017-02-08 12:03:16 +08:00
Max Lv	018aa781d3	Merge branch 'develop' into beta	2017-02-08 12:01:05 +08:00
Max Lv	f7e2f8694d	Add missing rules of base64.c	2017-02-08 11:58:15 +08:00
Max Lv	2d86122297	Update shadowsocks-libev	2017-02-08 11:58:15 +08:00
Max Lv	ad0578d073	Fix UDP relay issues	2017-02-08 11:58:15 +08:00
Max Lv	b671bc2c50	Update shadowsocks-libev	2017-02-08 11:58:15 +08:00
Mygod	be5036183d	Fix issues about SIP002	2017-02-08 11:58:15 +08:00
Mygod	212c3f666b	Update shadowsocks-libev	2017-02-08 11:58:15 +08:00
Mygod	deba1028c0	Remove unused sources in libsodium	2017-02-08 11:58:15 +08:00
Mygod	5559295beb	Remove useless files in libsodium makefile	2017-02-08 11:58:15 +08:00
Mygod	41eec3e351	Use stable branch of libsodium	2017-02-08 11:58:15 +08:00
Mygod	56709385b1	Add missing AEAD ciphers	2017-02-08 11:58:15 +08:00
Mygod	dc13249a1e	Implement SIP002 https://github.com/shadowsocks/shadowsocks-org/issues/27	2017-02-08 11:58:15 +08:00
Mygod	d579660682	Remove obsolete ciphers	2017-02-08 11:58:15 +08:00
Mygod	1e96a13ab1	Implement SIP004 https://github.com/shadowsocks/shadowsocks-org/issues/30	2017-02-08 11:58:15 +08:00
Mygod	b71b27fbdf	Use official repo of libsodium	2017-02-08 11:58:15 +08:00
Mygod	3fa8a0c90c	Refine roundings for TrafficMonitor	2017-02-04 11:46:13 +08:00
Mygod	f121ea2549	Prevent crashing when no market is installed	2017-02-02 21:51:52 +08:00
Mygod	df1e40d60b	Refine Subnet	2017-02-02 21:51:13 +08:00
Mygod	ee08f02660	Use remote DNS for VPN	2017-02-02 21:49:31 +08:00
Mygod	7af26d1a4b	Increase minimum sync time to let shadowsocks set up	2017-02-02 21:49:24 +08:00
Mygod	88319ecac7	Suggest to use fully qualified name for authorities in doc	2017-02-02 21:43:01 +08:00
Mygod	b397ab2bbd	Support pasting multiple lines	2017-02-02 21:27:35 +08:00
Mygod	33c087f13f	Refine FAQ	2017-02-02 20:58:30 +08:00
Mygod	4996d4fc52	Add a known issue for Huawei's buggy ROM	2017-02-02 17:22:27 +08:00
Mygod	14fd86c716	Update android support library	2017-01-31 20:15:25 +08:00
Mygod	3b9a35d3e6	Merge branch 'beta' into develop	2017-01-31 19:30:37 +08:00
Mygod	3b93302539	Update dependencies	2017-01-31 01:37:25 +08:00
Max Lv	8de1dc1f7a	Add signature	2017-01-24 22:59:26 +08:00
Mygod	55667c9e76	Add getOrDefault method for API 23- in plugin lib	2017-01-24 22:53:24 +08:00
Mygod	e81c4f257e	Bump plugin lib version	2017-01-24 22:52:54 +08:00
Mygod	61a926ff5e	Update plugin doc	2017-01-24 22:42:24 +08:00
Mygod	8d1f2da1f0	Implement SIGTERM in jni-helper	2017-01-24 18:44:31 +08:00
Mygod	30c8c7e6eb	Fix wrong thread error in binderDied	2017-01-24 16:58:55 +08:00
Mygod	dadeffa903	Rename System to JniHelper to rename naming conflicts with `java.lang.System`	2017-01-24 16:58:20 +08:00
Max Lv	04e0cb02b5	Bump version	2017-01-23 19:17:56 +08:00
Max Lv	1cec7299e8	Clean up	2017-01-23 18:28:52 +08:00
Max Lv	e634083820	Add plugins for sonatype	2017-01-23 18:18:28 +08:00
Mygod	d8775d4420	Fine tuning icon_list_item_2 padding	2017-01-23 18:17:37 +08:00
Mygod	41da705fc2	Plugin library 0.0.1	2017-01-23 17:42:21 +08:00
Mygod	911eb3dab3	Add documentations to plugin	2017-01-23 17:38:25 +08:00
Mygod	a31befef7f	Remove duplicated entryValues from BottomSheetPreferenceDialogFragment	2017-01-23 16:36:11 +08:00
Mygod	4d4d6ed1a0	Add RESULT_FALLBACK to ConfigurationActivity	2017-01-23 14:31:42 +08:00
Mygod	a8222317d7	Fix layout issues on Android 4.4	2017-01-23 14:19:08 +08:00
Mygod	b3bab982a8	Fix HelpCallback	2017-01-23 03:43:23 +08:00
Mygod	6fb7330e36	Fix crash on unknown plugin	2017-01-23 03:42:59 +08:00
Mygod	974c254460	Fix plugin preference icon	2017-01-23 02:48:36 +08:00
Mygod	c0aff7dda1	Add signature checking to plugin platform	2017-01-23 02:42:09 +08:00
Mygod	f6253d2eba	Fix crash when creating Snackbar in ProfileConfigFragment	2017-01-23 02:33:58 +08:00
Mygod	cbb0345e5b	Fix obtaining packageName in NativePlugin	2017-01-23 01:40:56 +08:00
Mygod	128d47aba1	Properly speed up ndk-build Original idea from @wongsyrone.	2017-01-23 01:03:03 +08:00
Mygod	e3ad38318d	Update README and licenses	2017-01-22 21:10:48 +08:00
Mygod	77296cbd3e	Remove obsolete permission	2017-01-22 20:51:59 +08:00
Mygod	14745317d0	Implement native mode without binary copying Plugins that support this mode only need to implement `NativePluginProvider.getExecutable`.	2017-01-22 20:51:16 +08:00
Mygod	9e6948caf6	Fix switch to VPN button in Snackbar	2017-01-22 16:16:48 +08:00
Mygod	18302e1c40	Refine code style	2017-01-22 16:06:47 +08:00
Max Lv	340e9cfffa	Update GFWList	2017-01-21 16:51:10 +08:00
Max Lv	caf5731ff6	Update GFWList	2017-01-21 16:48:50 +08:00
Max Lv	36faaad44d	Update simple-obfs	2017-01-21 16:46:54 +08:00
Max Lv	4c45c923be	Update shadowsocks-libev	2017-01-21 16:35:45 +08:00
Max Lv	2181e664ef	Add gvt2	2017-01-21 16:22:55 +08:00
Mygod	56e4f153ed	Update backup helper	2017-01-20 17:57:28 +08:00
Mygod	2e3baa727d	Move config files to files directory It looks nicer. Other changes btw: * Removes duplicated logcats from GuardedProcess; * local_port is moved to command line options since that's not sensitive; * pdnsd uses cache dir; * Refinements to Utils.	2017-01-20 17:57:28 +08:00
Mygod	7491a667a5	Fix ss-tunnel local port	2017-01-20 17:27:42 +08:00
Mygod	1041dc370a	Move non-options to command line options	2017-01-20 15:35:57 +08:00
Max Lv	d734e9fd4e	Fix socket protect in simple-obfs	2017-01-20 09:57:26 +08:00
Mygod	0e85514c76	Connection test should connect to China LAN when using Chinalist Fix #1080.	2017-01-20 06:13:33 +08:00
Mygod	7e6cc4e846	Refine EditTextPreference layout	2017-01-20 06:10:50 +08:00
Mygod	4f3c7dd8fd	Use proper JSON support for config files	2017-01-20 04:37:22 +08:00
Mygod	923374a28b	Add back handler for ACL fragment	2017-01-20 04:30:59 +08:00
Mygod	7d3f6096b7	Add plugin to card Fix #1054.	2017-01-20 04:13:59 +08:00
Mygod	c7c72c6543	Add missing layout	2017-01-20 03:49:08 +08:00
Mygod	b95bee968a	Use dimen instead of Utils.dpToPx	2017-01-20 03:46:43 +08:00
Mygod	99d97d1dbd	Fix launching plugin	2017-01-20 03:29:17 +08:00
Max Lv	b78c10e8cc	Fix content provider	2017-01-19 20:43:02 +08:00
Max Lv	91be4146f9	Update README	2017-01-19 15:52:37 +08:00
Max Lv	77a06cb519	Fix CFLAGS	2017-01-18 17:56:10 +08:00
Max Lv	6eb6c571ac	Update makefile	2017-01-18 17:29:21 +08:00
Max Lv	01c5e8bb6f	Update submodules	2017-01-18 16:22:55 +08:00
Max Lv	437d8c3026	Revert "Revert "Speed up ndk-build from sbt-android"" This reverts commit `bcbd860457`.	2017-01-17 21:30:54 +08:00
Mygod	70e0b3991d	Misc improvements for plugin design	2017-01-17 21:14:10 +08:00
Mygod	0ffae32a44	Implement plugin interface in mobile app	2017-01-16 22:30:26 +08:00
Max Lv	44b47e6cd3	Update background for #1082	2017-01-16 16:18:18 +08:00
Mygod	c54745e241	Adapt to simple-obfs plugin options parser	2017-01-16 09:31:37 +08:00
Mygod	e3cf54f703	Update shadowsocks-libev	2017-01-16 09:22:31 +08:00
Mygod	d5be325ab5	Some bugfixes for new UI	2017-01-14 02:31:01 +08:00
Mygod	a38c9920c3	Add initial support for configuring plugins	2017-01-14 02:20:27 +08:00
Mygod	1887c6ffb0	Initial commit for plugin library See spec at #1073.	2017-01-13 20:20:33 +08:00
Mygod	5ead55d67a	Rename plugin-lib to plugin	2017-01-13 02:35:02 +08:00
Mygod	a03ef5dfe9	Initial commit for plugin-lib	2017-01-13 02:29:49 +08:00
Mygod	f6bbaa7251	Remove kcptun from travis	2017-01-13 00:33:57 +08:00
Mygod	2798eddaa7	Remove KCP from project	2017-01-13 00:31:58 +08:00
Mygod	044f6f1fce	Apply commonSettings to root	2017-01-12 23:52:10 +08:00
Mygod	0030c29b62	Move app to mobile subproject	2017-01-12 23:31:52 +08:00
Mygod	2c1c4b9b4f	Update strings.xml (POEditor.com)	2017-01-12 08:53:17 -06:00
Mygod	f2c260a438	Update strings.xml (POEditor.com)	2017-01-12 08:53:15 -06:00
Mygod	d2d1796852	Update strings.xml (POEditor.com)	2017-01-12 08:53:12 -06:00
Max Lv	c7b242789d	Bump version	2017-01-12 22:11:18 +08:00
Mygod	1c53181c9c	Remove hash tag if profile name is empty	2017-01-10 11:17:56 +08:00
Max Lv	bcbd860457	Revert "Speed up ndk-build from sbt-android"	2017-01-09 21:29:15 +08:00
Syrone Wong	33d8139f57	Speed up ndk-build from sbt-android Signed-off-by: Syrone Wong <wong.syrone@gmail.com>	2017-01-09 20:02:43 +08:00
Mygod	5a8493e0b1	Remove unused strings	2017-01-09 18:22:16 +08:00
Mygod	3c3e531718	Add backup entry for custom rules Refine #1069.	2017-01-09 16:36:45 +08:00
Mygod	1f6d6bbd14	Update Acl.scala to be compliant with acl.c	2017-01-09 15:41:19 +08:00
Mygod	c25433e2da	Remove suggestions when inputting custom rules	2017-01-09 15:31:56 +08:00
Mygod	0b68faf672	Fix Subnet ordering	2017-01-09 15:29:06 +08:00
Mygod	7978bcedbf	Remove unused include in system.cpp	2017-01-09 15:20:27 +08:00
Mygod	eb3b01053e	Fix 'Fix #1064 '	2017-01-09 15:12:53 +08:00
Mygod	17bedaffcd	Fix #1064	2017-01-09 14:47:14 +08:00
Mygod	49fbfcc2ac	Refine an issue mentioned in #1064	2017-01-09 00:16:50 +08:00
Mygod	c2930bfe04	Refine README	2017-01-08 23:52:26 +08:00
Mygod	e7cc5ad0ba	Use NDK build in sbt-android instead	2017-01-08 23:51:30 +08:00
Mygod	f81b16ead6	Update issue_template	2017-01-08 23:37:20 +08:00
Max Lv	162fcb47bc	Fix #1066	2017-01-08 11:23:37 +08:00
Mygod	67fab0392f	Let Android system extract native libraries	2017-01-07 06:37:27 -06:00
Mygod	bf89e202d1	Refine README	2017-01-07 18:03:33 +08:00
Mygod	050cc7a018	Add POEditor for translators	2017-01-07 17:49:12 +08:00
Mygod	7e92e1ac0d	Update strings.xml (POEditor.com)	2017-01-07 03:43:05 -06:00
Mygod	1758f360c0	Update strings.xml (POEditor.com)	2017-01-07 03:42:51 -06:00
Mygod	e32ac67794	Update strings.xml (POEditor.com)	2017-01-07 03:42:46 -06:00
Mygod	5434193903	Update strings.xml (POEditor.com)	2017-01-07 03:42:43 -06:00
Mygod	2efb6fb4c6	Update strings.xml (POEditor.com)	2017-01-07 03:42:41 -06:00
Mygod	5d744066ac	Remove untranslatable strings	2017-01-07 17:31:41 +08:00
Mygod	b897e4d044	Make bytes translatable	2017-01-07 17:19:09 +08:00
Mygod	5206b4c1f1	Simplify strings.xml	2017-01-07 17:17:28 +08:00
Mygod	694be8abbe	Update README and LICENSE	2017-01-07 16:50:08 +08:00
Mygod	0a2d374de2	Use variables to store android support lib and google services version	2017-01-07 16:50:08 +08:00
LNDDYL	9dec28a022	Update translation for Traditional Chinese (#1061 ) * Update translation for Traditional Chinese * Update EN * Fix	2017-01-07 02:49:08 -06:00
Mygod	5a6e45a2a7	Fix NullPointerException caused by delay	2017-01-07 15:14:41 +08:00
Mygod	6d536a901b	Fix ETXTBSY when opening custom rules	2017-01-07 15:09:11 +08:00
Mygod	57be4055d3	Show nothing for profiles with no bandwidth history	2017-01-07 14:53:56 +08:00
Mygod	2d9102719e	Remove obsolete camera shortcut	2017-01-07 14:51:09 +08:00
Mygod	5e9f78d31a	Prevent crash when importing Fix #1060.	2017-01-07 14:48:19 +08:00
Max Lv	f4026e5a86	Bump version	2017-01-07 11:03:06 +08:00
Max Lv	fb98b3e4a1	Fix fast scroller in per-app config	2017-01-07 09:49:22 +08:00
Max Lv	f629c432b0	Update licenses, close #1059	2017-01-07 08:56:19 +08:00
Mygod	4c15d27a99	Update dependencies	2017-01-07 04:05:02 +08:00
Mygod	341c85049b	Add fast scroller to custom rules and per-app proxy config	2017-01-07 03:54:01 +08:00
Mygod	35d7611524	Add state check before sending initial trafficUpdated event	2017-01-07 02:52:25 +08:00
Mygod	d10acf52ec	Fix remoteDns not used in NAT with UDP disabled	2017-01-06 17:13:31 +08:00
Max Lv	0234acbf5f	Merge pull request #1056 from Mygod/custom-rules Implement custom rules	2017-01-06 02:59:32 -06:00
Mygod	292c76b227	Fix remove snackbar	2017-01-06 16:46:54 +08:00
Mygod	a67c29314e	Fix deprecation warning in UndoSnackbarManager	2017-01-06 16:43:37 +08:00
Mygod	0fc9c6fb8a	Remove unused copy_url	2017-01-06 16:38:40 +08:00
Mygod	82a3e429d1	Prevent syncing custom-rules	2017-01-06 16:30:41 +08:00
Mygod	b4425e3b06	Fix NullReferenceException	2017-01-06 16:29:37 +08:00
Mygod	ac2b668a4b	Implement custom rules Fix #1009 finally!	2017-01-06 16:20:26 +08:00
Mygod	8374a8cdcc	Fix building	2017-01-06 13:00:50 +08:00
Mygod	7feb049f4b	Update gfwlist	2017-01-06 12:29:42 +08:00
Mygod	5bc7c9f8cc	Fix bandwidth display in ProfilesFragment when hot swapping profiles	2017-01-05 22:08:37 +08:00
Mygod	115fbcb2fe	Add a fading when switching profiles	2017-01-05 21:25:59 +08:00
Mygod	69d2bc1ee5	Set card background using StateListDrawable	2017-01-05 21:21:51 +08:00
Mygod	af9e8c786d	Bugfix for layout gravity	2017-01-05 20:51:51 +08:00
Max Lv	5ca3baac95	Update licenses #1043	2016-12-31 16:10:02 +08:00
Mygod	878c53ee30	Refine profile bandwidth gravity	2016-12-31 00:14:01 +08:00
Mygod	eb7e608d0b	Use custom tabs in AboutFragment	2016-12-30 22:22:06 +08:00
Mygod	ef6a9e7727	Remove obsolete tools:ignore	2016-12-30 22:10:47 +08:00
Mygod	2edc14a695	Refine database package	2016-12-30 22:10:47 +08:00
Max Lv	bc94adef38	Use centerCrop	2016-12-30 20:43:15 +08:00
Max Lv	dd8031519c	Revert "Replace image with gradient color" This reverts commit `b0412b4f1f`.	2016-12-30 20:42:04 +08:00
Max Lv	b0412b4f1f	Replace image with gradient color	2016-12-30 18:33:36 +08:00
Mygod	7e94e25d49	Refine #1034	2016-12-29 17:51:44 +08:00
Mygod	068906cd0f	Remove obsolete items in FAQ	2016-12-29 16:21:53 +08:00
Mygod	e24c2256af	Hide circle onResume	2016-12-29 16:20:37 +08:00
Mygod	d78e823ce2	Allow user to use any QR code scanner and remove unused resources	2016-12-29 16:16:56 +08:00
Mygod	8e46be5900	Allow user to use any QR code scanner	2016-12-29 16:01:32 +08:00
Mygod	2e73741825	Fix excess unsaved prompt AppManager's sub-activity should maintain dirty flags by themselves. Fix #1032.	2016-12-29 15:34:54 +08:00
Mygod	022b6da9c9	Refine issue template	2016-12-29 01:29:36 -06:00
Mygod	622cef048c	Add an FAQ section in drawer	2016-12-29 01:29:36 -06:00