From 31a5cff9560b4c8b38e6ae45477b076d81f7e77d Mon Sep 17 00:00:00 2001
From: Max Lv <max.c.lv@gmail.com>
Date: Fri, 25 Jul 2014 20:53:17 +0800
Subject: [PATCH] refine #100

---
 build-ndk.sh                                  |  4 +--
 jni/Android.mk                                | 32 +++++++++----------
 project/plugins.sbt                           |  2 +-
 .../shadowsocks/ShadowsocksNatService.scala   |  5 ++-
 .../shadowsocks/ShadowsocksVpnService.scala   |  6 +++-
 5 files changed, 28 insertions(+), 21 deletions(-)

diff --git a/build-ndk.sh b/build-ndk.sh
index 79427e1d..ddc4a59e 100755
--- a/build-ndk.sh
+++ b/build-ndk.sh
@@ -16,8 +16,8 @@ do
     mv libs/armeabi-v7a/$app src/main/assets/armeabi-v7a/
     mv libs/x86/$app src/main/assets/x86/
 done
-rm -rf src/main/jni
-mv libs src/main/jni
+rm -rf src/main/libs
+mv libs src/main/
 
 # Target 16
 cp jni/Application.mk.16 jni/Application.mk
diff --git a/jni/Android.mk b/jni/Android.mk
index 0c4e5c1c..654be81a 100755
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -183,22 +183,22 @@ include $(BUILD_SHARED_LIBRARY)
 ## shadowsocks tunnel
 ########################################################
 
-include $(CLEAR_VARS)
-
-SHADOWSOCKS_SOURCES := tunnel.c cache.c udprelay.c encrypt.c utils.c json.c jconf.c
-
-LOCAL_MODULE    := ss-tunnel
-LOCAL_SRC_FILES := $(addprefix shadowsocks/src/, $(SHADOWSOCKS_SOURCES))
-LOCAL_CFLAGS    := -Wall -O2 -fno-strict-aliasing -DUDPRELAY_LOCAL -DUDPRELAY_TUNNEL \
-					-DUSE_CRYPTO_OPENSSL -DANDROID -DHAVE_CONFIG_H \
-					-I$(LOCAL_PATH)/libev/ \
-					-I$(LOCAL_PATH)/openssl/include 
-
-LOCAL_STATIC_LIBRARIES := libev libcrypto
-
-LOCAL_LDLIBS := -llog
-
-include $(BUILD_EXECUTABLE)
+# include $(CLEAR_VARS)
+#
+# SHADOWSOCKS_SOURCES := tunnel.c cache.c udprelay.c encrypt.c utils.c json.c jconf.c
+#
+# LOCAL_MODULE    := ss-tunnel
+# LOCAL_SRC_FILES := $(addprefix shadowsocks/src/, $(SHADOWSOCKS_SOURCES))
+# LOCAL_CFLAGS    := -Wall -O2 -fno-strict-aliasing -DUDPRELAY_LOCAL -DUDPRELAY_TUNNEL \
+# 					-DUSE_CRYPTO_OPENSSL -DANDROID -DHAVE_CONFIG_H \
+# 					-I$(LOCAL_PATH)/libev/ \
+# 					-I$(LOCAL_PATH)/openssl/include 
+#
+# LOCAL_STATIC_LIBRARIES := libev libcrypto
+#
+# LOCAL_LDLIBS := -llog
+#
+# include $(BUILD_EXECUTABLE)
 
 ########################################################
 ## shadowsocks tunnel library
diff --git a/project/plugins.sbt b/project/plugins.sbt
index b552dddb..4f5571cd 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -1,5 +1,5 @@
 resolvers += Resolver.url("scalasbt releases", new URL("http://scalasbt.artifactoryonline.com/scalasbt/sbt-plugin-snapshots"))(Resolver.ivyStylePatterns)
 
-addSbtPlugin("com.hanhuy.sbt" % "android-sdk-plugin" % "1.2.16")
+addSbtPlugin("com.hanhuy.sbt" % "android-sdk-plugin" % "1.3.3")
 
 addSbtPlugin("com.github.mpeltonen" % "sbt-idea" % "1.6.0")
diff --git a/src/main/scala/com/github/shadowsocks/ShadowsocksNatService.scala b/src/main/scala/com/github/shadowsocks/ShadowsocksNatService.scala
index 4357c001..b6ddbc54 100644
--- a/src/main/scala/com/github/shadowsocks/ShadowsocksNatService.scala
+++ b/src/main/scala/com/github/shadowsocks/ShadowsocksNatService.scala
@@ -310,9 +310,12 @@ class ShadowsocksNatService extends Service with BaseService {
   }
 
   override def onStartCommand(intent: Intent, flags: Int, startId: Int): Int = {
-    Service.START_NOT_STICKY
+    Service.START_STICKY
   }
 
+  override def onTaskRemoved(intent: Intent) {
+    stopRunner()
+  }
 
   def killProcesses() {
     Console.runRootCommand(Utils.getIptables + " -t nat -F OUTPUT")
diff --git a/src/main/scala/com/github/shadowsocks/ShadowsocksVpnService.scala b/src/main/scala/com/github/shadowsocks/ShadowsocksVpnService.scala
index 6e19bfdd..87105c0e 100644
--- a/src/main/scala/com/github/shadowsocks/ShadowsocksVpnService.scala
+++ b/src/main/scala/com/github/shadowsocks/ShadowsocksVpnService.scala
@@ -256,7 +256,11 @@ class ShadowsocksVpnService extends VpnService with BaseService {
   }
 
   override def onStartCommand(intent: Intent, flags: Int, startId: Int): Int = {
-    Service.START_NOT_STICKY
+    Service.START_STICKY
+  }
+
+  override def onTaskRemoved(intent: Intent) {
+    stopRunner()
   }
 
   override def onRevoke() {