From 8f80fbfd4a5f560f6693a5484c4fe939aae7e63c Mon Sep 17 00:00:00 2001
From: Max Lv <max.c.lv@gmail.com>
Date: Wed, 21 Sep 2016 14:08:49 +0800
Subject: [PATCH] Bump version

---
 kcptun/kcptun                                           | 2 +-
 src/main/AndroidManifest.xml                            | 4 ++--
 src/main/scala/com/github/shadowsocks/BaseService.scala | 6 +++++-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/kcptun/kcptun b/kcptun/kcptun
index e44d8c90..46dd8eab 160000
--- a/kcptun/kcptun
+++ b/kcptun/kcptun
@@ -1 +1 @@
-Subproject commit e44d8c9041b0f8825295bca089ff3dbad294508c
+Subproject commit 46dd8eab14587d88d37d5d36146f0a059f254949
diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index 0de2029f..0c2a497f 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           xmlns:tools="http://schemas.android.com/tools" package="com.github.shadowsocks"
-          android:versionCode="157"
-          android:versionName="3.1.5">
+          android:versionCode="158"
+          android:versionName="3.1.6">
 
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
diff --git a/src/main/scala/com/github/shadowsocks/BaseService.scala b/src/main/scala/com/github/shadowsocks/BaseService.scala
index 56a61351..9e2cea4d 100644
--- a/src/main/scala/com/github/shadowsocks/BaseService.scala
+++ b/src/main/scala/com/github/shadowsocks/BaseService.scala
@@ -69,6 +69,7 @@ trait BaseService extends Service {
   final val callbacks = new RemoteCallbackList[IShadowsocksServiceCallback]
   var callbacksCount: Int = _
   lazy val handler = new Handler(getMainLooper)
+  lazy val restartHanlder = new Handler(getMainLooper)
 
   private val closeReceiver: BroadcastReceiver = (context: Context, intent: Intent) => {
     Toast.makeText(context, R.string.stopping, Toast.LENGTH_SHORT).show()
@@ -82,7 +83,10 @@ trait BaseService extends Service {
    val activeNetwork = cm.getActiveNetworkInfo()
    val isConnected = activeNetwork != null && activeNetwork.isConnected()
 
-   if (isConnected && profile.kcp && kcptunProcess != null) kcptunProcess.restart()
+   if (isConnected && profile.kcp && kcptunProcess != null) {
+     restartHanlder.removeCallbacks(null)
+     restartHanlder.postDelayed(() => kcptunProcess.restart(), 2000)
+   }
   }
   var networkReceiverRegistered: Boolean = _