From e38ed2d0690268e23e922b2de0eb965ac4bad21f Mon Sep 17 00:00:00 2001 From: Max Lv Date: Mon, 27 Oct 2014 20:43:14 +0800 Subject: [PATCH] bump version --- jni/Application.mk | 2 +- src/main/AndroidManifest.xml | 4 ++-- .../scala/com/github/shadowsocks/Shadowsocks.scala | 12 +++++++----- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/jni/Application.mk b/jni/Application.mk index 402fbfe3..d8820faa 100644 --- a/jni/Application.mk +++ b/jni/Application.mk @@ -1,4 +1,4 @@ APP_ABI := armeabi-v7a x86 APP_PLATFORM := android-16 APP_STL := stlport_static -NDK_TOOLCHAIN_VERSION := 4.8 +NDK_TOOLCHAIN_VERSION := 4.9 diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml index 1864ccdb..c5c137fd 100644 --- a/src/main/AndroidManifest.xml +++ b/src/main/AndroidManifest.xml @@ -1,7 +1,7 @@ + android:versionCode="77" + android:versionName="2.3.2"> diff --git a/src/main/scala/com/github/shadowsocks/Shadowsocks.scala b/src/main/scala/com/github/shadowsocks/Shadowsocks.scala index 34a52528..888421ca 100644 --- a/src/main/scala/com/github/shadowsocks/Shadowsocks.scala +++ b/src/main/scala/com/github/shadowsocks/Shadowsocks.scala @@ -335,12 +335,14 @@ class Shadowsocks Console.runCommand(ab.toArray) - ab.clear() - ab.append("kill -9 `cat /data/data/com.github.shadowsocks/redsocks.pid`") - ab.append("rm /data/data/com.github.shadowsocks/redsocks.conf") - ab.append(Utils.getIptables + " -t nat -F OUTPUT") + if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) { + ab.clear() + ab.append("kill -9 `cat /data/data/com.github.shadowsocks/redsocks.pid`") + ab.append("rm /data/data/com.github.shadowsocks/redsocks.conf") + ab.append(Utils.getIptables + " -t nat -F OUTPUT") - Console.runRootCommand(ab.toArray) + Console.runRootCommand(ab.toArray) + } } private def getVersionName: String = {