update plugin

project/plugins.sbt

@@ -1,6 +1,6 @@
 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.5.1")
+addSbtPlugin("com.hanhuy.sbt" % "android-sdk-plugin" % "1.5.5")
 
 resolvers += "Sonatype snapshots" at "https://oss.sonatype.org/content/repositories/snapshots/"
 

src/main/AndroidManifest.xml

@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.github.shadowsocks"
-    android:versionCode="118"
-    android:versionName="2.8.1">
+    android:versionCode="119"
+    android:versionName="2.8.2">
 
   <uses-permission android:name="android.permission.INTERNET"/>
   <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>

src/main/res/values/chnroute.xml

@@ -388,6 +388,8 @@
         <item>43.246.0.0/18</item>
         <item>43.246.64.0/19</item>
         <item>43.246.96.0/22</item>
+        <item>43.246.212.0/22</item>
+        <item>43.246.228.0/22</item>
         <item>43.247.4.0/22</item>
         <item>43.247.8.0/22</item>
         <item>43.247.44.0/22</item>
@@ -655,6 +657,22 @@
         <item>45.125.96.0/21</item>
         <item>45.125.104.0/22</item>
         <item>45.125.136.0/22</item>
+        <item>45.126.48.0/21</item>
+        <item>45.126.100.0/22</item>
+        <item>45.126.108.0/22</item>
+        <item>45.126.112.0/21</item>
+        <item>45.126.120.0/22</item>
+        <item>45.126.212.0/22</item>
+        <item>45.126.220.0/22</item>
+        <item>45.127.8.0/21</item>
+        <item>45.127.36.0/22</item>
+        <item>45.127.96.0/22</item>
+        <item>45.127.116.0/22</item>
+        <item>45.127.124.0/22</item>
+        <item>45.127.128.0/22</item>
+        <item>45.127.144.0/21</item>
+        <item>45.127.156.0/22</item>
+        <item>45.127.216.0/22</item>
         <item>47.92.0.0/14</item>
         <item>47.96.0.0/11</item>
         <item>49.4.0.0/14</item>
@@ -699,6 +717,7 @@
         <item>59.107.0.0/16</item>
         <item>59.108.0.0/14</item>
         <item>59.151.0.0/17</item>
+        <item>59.153.4.0/22</item>
         <item>59.155.0.0/16</item>
         <item>59.172.0.0/14</item>
         <item>59.191.0.0/17</item>
@@ -844,6 +863,7 @@
         <item>103.8.156.0/22</item>
         <item>103.8.200.0/21</item>
         <item>103.8.220.0/22</item>
+        <item>103.9.8.0/22</item>
         <item>103.9.152.0/22</item>
         <item>103.9.248.0/21</item>
         <item>103.10.0.0/22</item>
@@ -971,6 +991,8 @@
         <item>103.35.48.0/22</item>
         <item>103.35.104.0/22</item>
         <item>103.35.116.0/22</item>
+        <item>103.35.200.0/22</item>
+        <item>103.35.220.0/22</item>
         <item>103.36.20.0/22</item>
         <item>103.36.28.0/22</item>
         <item>103.36.36.0/22</item>
@@ -1293,6 +1315,23 @@
         <item>103.193.240.0/22</item>
         <item>103.194.16.0/22</item>
         <item>103.194.230.0/23</item>
+        <item>103.195.104.0/22</item>
+        <item>103.195.112.0/22</item>
+        <item>103.195.136.0/22</item>
+        <item>103.195.148.0/22</item>
+        <item>103.195.152.0/22</item>
+        <item>103.195.160.0/22</item>
+        <item>103.195.192.0/22</item>
+        <item>103.196.60.0/22</item>
+        <item>103.196.64.0/22</item>
+        <item>103.196.72.0/22</item>
+        <item>103.196.88.0/21</item>
+        <item>103.196.96.0/22</item>
+        <item>103.196.168.0/22</item>
+        <item>103.196.184.0/22</item>
+        <item>103.196.204.0/22</item>
+        <item>103.197.180.0/22</item>
+        <item>103.197.228.0/22</item>
         <item>103.224.40.0/21</item>
         <item>103.224.60.0/22</item>
         <item>103.224.80.0/22</item>
@@ -1371,6 +1410,7 @@
         <item>103.234.128.0/22</item>
         <item>103.234.172.0/22</item>
         <item>103.234.180.0/22</item>
+        <item>103.234.244.0/22</item>
         <item>103.235.16.0/22</item>
         <item>103.235.48.0/22</item>
         <item>103.235.56.0/21</item>
@@ -1386,6 +1426,10 @@
         <item>103.236.64.0/19</item>
         <item>103.236.96.0/22</item>
         <item>103.236.120.0/22</item>
+        <item>103.236.184.0/22</item>
+        <item>103.236.220.0/22</item>
+        <item>103.236.232.0/22</item>
+        <item>103.236.240.0/20</item>
         <item>103.237.0.0/20</item>
         <item>103.237.24.0/21</item>
         <item>103.237.68.0/22</item>
@@ -2156,6 +2200,7 @@
         <item>150.115.0.0/16</item>
         <item>150.121.0.0/16</item>
         <item>150.122.0.0/16</item>
+        <item>150.129.136.0/22</item>
         <item>150.129.152.0/22</item>
         <item>150.129.192.0/22</item>
         <item>150.129.216.0/22</item>
@@ -2598,6 +2643,8 @@
         <item>202.122.128.0/24</item>
         <item>202.122.132.0/24</item>
         <item>202.123.96.0/20</item>
+        <item>202.123.116.0/22</item>
+        <item>202.123.120.0/22</item>
         <item>202.124.16.0/21</item>
         <item>202.124.24.0/22</item>
         <item>202.125.112.0/20</item>
@@ -2679,6 +2726,8 @@
         <item>202.172.0.0/22</item>
         <item>202.173.0.0/22</item>
         <item>202.173.8.0/21</item>
+        <item>202.173.112.0/22</item>
+        <item>202.173.120.0/22</item>
         <item>202.173.224.0/19</item>
         <item>202.174.64.0/20</item>
         <item>202.176.224.0/19</item>
@@ -3698,6 +3747,7 @@
         <item>220.112.0.0/14</item>
         <item>220.152.128.0/17</item>
         <item>220.154.0.0/15</item>
+        <item>220.158.240.0/22</item>
         <item>220.160.0.0/11</item>
         <item>220.192.0.0/12</item>
         <item>220.231.0.0/18</item>

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

@@ -178,7 +178,7 @@ class ShadowsocksNatService extends Service with BaseService {
 
     val conf = ConfigUtils
       .SHADOWSOCKS.formatLocal(Locale.ENGLISH, config.proxy, config.remotePort, config.localPort,
-        config.sitekey, config.encMethod, 10)
+        config.sitekey, config.encMethod, 600)
     ConfigUtils.printToFile(new File(Path.BASE + "ss-local-nat.conf"))(p => {
       p.println(conf)
     })

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

@@ -68,10 +68,10 @@ class ShadowsocksVpnService extends VpnService with BaseService {
   val PRIVATE_VLAN = "26.26.26.%s"
   val PRIVATE_VLAN6 = "fdfe:dcba:9876::%s"
   var conn: ParcelFileDescriptor = null
-  var receiver: BroadcastReceiver = null
   var apps: Array[ProxiedApp] = null
   var config: Config = null
   var vpnThread: ShadowsocksVpnThread = null
+  var closeReceiver: BroadcastReceiver = null
 
   def isByass(net: SubnetUtils): Boolean = {
     val info = net.getInfo
@@ -171,10 +171,10 @@ class ShadowsocksVpnService extends VpnService with BaseService {
       stopSelf()
     }
 
-    // clean up the context
-    if (receiver != null) {
-      unregisterReceiver(receiver)
-      receiver = null
+    // clean up recevier
+    if (closeReceiver != null) {
+      unregisterReceiver(closeReceiver)
+      closeReceiver = null
     }
 
     // channge the state
@@ -211,6 +211,16 @@ class ShadowsocksVpnService extends VpnService with BaseService {
 
     config = c
 
+    // register close receiver
+    val filter = new IntentFilter()
+    filter.addAction(Intent.ACTION_SHUTDOWN)
+    filter.addAction(Action.CLOSE)
+    closeReceiver = (context: Context, intent: Intent) => {
+      Toast.makeText(context, R.string.stopping, Toast.LENGTH_SHORT).show()
+      stopRunner()
+    }
+    registerReceiver(closeReceiver, filter)
+
     // ensure the VPNService is prepared
     if (VpnService.prepare(this) != null) {
       val i = new Intent(this, classOf[ShadowsocksRunnerActivity])
@@ -226,15 +236,6 @@ class ShadowsocksVpnService extends VpnService with BaseService {
       .setLabel(getVersionName)
       .build())
 
-    // register close receiver
-    val filter = new IntentFilter()
-    filter.addAction(Intent.ACTION_SHUTDOWN)
-    receiver = (p1: Context, p2: Intent) => {
-      Toast.makeText(p1, R.string.stopping, Toast.LENGTH_SHORT)
-      stopRunner()
-    }
-    registerReceiver(receiver, filter)
-
     changeState(State.CONNECTING)
 
     Future {
@@ -317,7 +318,7 @@ class ShadowsocksVpnService extends VpnService with BaseService {
 
     val conf = ConfigUtils
       .SHADOWSOCKS.formatLocal(Locale.ENGLISH, config.proxy, config.remotePort, config.localPort,
-        config.sitekey, config.encMethod, 10)
+        config.sitekey, config.encMethod, 600)
     ConfigUtils.printToFile(new File(Path.BASE + "ss-local-vpn.conf"))(p => {
       p.println(conf)
     })