Clean up

build.sbt

@@ -37,8 +37,8 @@ libraryDependencies ++= Seq(
   "com.github.clans" % "fab" % "1.6.4",
   "com.github.jorgecastilloprz" % "fabprogresscircle" % "1.01",
   "com.github.kevinsawicki" % "http-request" % "6.0",
-  "com.google.android.gms" % "play-services-ads" % "9.6.0",
-  "com.google.android.gms" % "play-services-analytics" % "9.6.0",
+  "com.google.android.gms" % "play-services-ads" % "9.6.1",
+  "com.google.android.gms" % "play-services-analytics" % "9.6.1",
   "com.j256.ormlite" % "ormlite-android" % "5.0",
   "com.twofortyfouram" % "android-plugin-api-for-locale" % "1.0.2",
   "dnsjava" % "dnsjava" % "2.1.7",
@@ -47,7 +47,7 @@ libraryDependencies ++= Seq(
   "net.glxn.qrgen" % "android" % "2.0"
 )
 
-proguardVersion in Android := "5.2.1"
+proguardVersion in Android := "5.3"
 
 proguardCache in Android := Seq()
 

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="159"
-          android:versionName="3.1.7">
+          android:versionCode="160"
+          android:versionName="3.2.0">
 
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>

src/main/res/values/arrays.xml

@@ -48,20 +48,12 @@
     </string-array>
 
     <string-array name="private_route">
-        <item>0.0.0.0/8</item>
         <item>10.0.0.0/8</item>
-        <item>100.64.0.0/10</item>
         <item>127.0.0.0/8</item>
         <item>169.254.0.0/16</item>
         <item>172.16.0.0/12</item>
         <item>192.0.0.0/29</item>
         <item>192.0.2.0/24</item>
-        <item>192.88.99.0/24</item>
-        <item>192.168.0.0/16</item>
-        <item>198.18.0.0/15</item>
-        <item>198.51.100.0/24</item>
-        <item>203.0.113.0/24</item>
-        <item>224.0.0.0/3</item>
     </string-array>
 
     <string-array name="bypass_private_route">
@@ -74,47 +66,8 @@
         <item>16.0.0.0/4</item>
         <item>32.0.0.0/3</item>
         <item>64.0.0.0/3</item>
-        <item>96.0.0.0/6</item>
-        <item>100.0.0.0/10</item>
-        <item>100.128.0.0/9</item>
-        <item>101.0.0.0/8</item>
-        <item>102.0.0.0/7</item>
-        <item>104.0.0.0/5</item>
-        <item>112.0.0.0/10</item>
-        <item>112.64.0.0/11</item>
-        <item>112.96.0.0/12</item>
-        <item>112.112.0.0/13</item>
-        <item>112.120.0.0/14</item>
-        <item>112.124.0.0/19</item>
-        <item>112.124.32.0/21</item>
-        <item>112.124.40.0/22</item>
-        <item>112.124.44.0/23</item>
-        <item>112.124.46.0/24</item>
-        <item>112.124.48.0/20</item>
-        <item>112.124.64.0/18</item>
-        <item>112.124.128.0/17</item>
-        <item>112.125.0.0/16</item>
-        <item>112.126.0.0/15</item>
-        <item>112.128.0.0/9</item>
-        <item>113.0.0.0/8</item>
-        <item>114.0.0.0/10</item>
-        <item>114.64.0.0/11</item>
-        <item>114.96.0.0/12</item>
-        <item>114.112.0.0/15</item>
-        <item>114.114.0.0/18</item>
-        <item>114.114.64.0/19</item>
-        <item>114.114.96.0/20</item>
-        <item>114.114.112.0/23</item>
-        <item>114.114.115.0/24</item>
-        <item>114.114.116.0/22</item>
-        <item>114.114.120.0/21</item>
-        <item>114.114.128.0/17</item>
-        <item>114.115.0.0/16</item>
-        <item>114.116.0.0/14</item>
-        <item>114.120.0.0/13</item>
-        <item>114.128.0.0/9</item>
-        <item>115.0.0.0/8</item>
-        <item>116.0.0.0/6</item>
+        <item>96.0.0.0/4</item>
+        <item>112.0.0.0/5</item>
         <item>120.0.0.0/6</item>
         <item>124.0.0.0/7</item>
         <item>126.0.0.0/8</item>
@@ -156,69 +109,13 @@
         <item>192.8.0.0/13</item>
         <item>192.16.0.0/12</item>
         <item>192.32.0.0/11</item>
-        <item>192.64.0.0/12</item>
-        <item>192.80.0.0/13</item>
-        <item>192.88.0.0/18</item>
-        <item>192.88.64.0/19</item>
-        <item>192.88.96.0/23</item>
-        <item>192.88.98.0/24</item>
-        <item>192.88.100.0/22</item>
-        <item>192.88.104.0/21</item>
-        <item>192.88.112.0/20</item>
-        <item>192.88.128.0/17</item>
-        <item>192.89.0.0/16</item>
-        <item>192.90.0.0/15</item>
-        <item>192.92.0.0/14</item>
-        <item>192.96.0.0/11</item>
-        <item>192.128.0.0/11</item>
-        <item>192.160.0.0/13</item>
-        <item>192.169.0.0/16</item>
-        <item>192.170.0.0/15</item>
-        <item>192.172.0.0/14</item>
-        <item>192.176.0.0/12</item>
-        <item>192.192.0.0/10</item>
+        <item>192.64.0.0/10</item>
+        <item>192.128.0.0/9</item>
         <item>193.0.0.0/8</item>
         <item>194.0.0.0/7</item>
-        <item>196.0.0.0/7</item>
-        <item>198.0.0.0/12</item>
-        <item>198.16.0.0/15</item>
-        <item>198.20.0.0/14</item>
-        <item>198.24.0.0/13</item>
-        <item>198.32.0.0/12</item>
-        <item>198.48.0.0/15</item>
-        <item>198.50.0.0/16</item>
-        <item>198.51.0.0/18</item>
-        <item>198.51.64.0/19</item>
-        <item>198.51.96.0/22</item>
-        <item>198.51.101.0/24</item>
-        <item>198.51.102.0/23</item>
-        <item>198.51.104.0/21</item>
-        <item>198.51.112.0/20</item>
-        <item>198.51.128.0/17</item>
-        <item>198.52.0.0/14</item>
-        <item>198.56.0.0/13</item>
-        <item>198.64.0.0/10</item>
-        <item>198.128.0.0/9</item>
-        <item>199.0.0.0/8</item>
-        <item>200.0.0.0/7</item>
-        <item>202.0.0.0/8</item>
-        <item>203.0.0.0/18</item>
-        <item>203.0.64.0/19</item>
-        <item>203.0.96.0/20</item>
-        <item>203.0.112.0/24</item>
-        <item>203.0.114.0/23</item>
-        <item>203.0.116.0/22</item>
-        <item>203.0.120.0/21</item>
-        <item>203.0.128.0/17</item>
-        <item>203.1.0.0/16</item>
-        <item>203.2.0.0/15</item>
-        <item>203.4.0.0/14</item>
-        <item>203.8.0.0/13</item>
-        <item>203.16.0.0/12</item>
-        <item>203.32.0.0/11</item>
-        <item>203.64.0.0/10</item>
-        <item>203.128.0.0/9</item>
-        <item>204.0.0.0/6</item>
+        <item>196.0.0.0/6</item>
+        <item>200.0.0.0/5</item>
         <item>208.0.0.0/4</item>
+        <item>224.0.0.0/3</item>
     </string-array>
 </resources>

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

@@ -1,6 +1,5 @@
 package com.github.shadowsocks
 
-import android.Manifest
 import android.app.Activity
 import android.content.Intent
 import android.content.pm.PackageManager
@@ -48,13 +47,13 @@ class ScannerActivity extends AppCompatActivity with ZXingScannerView.ResultHand
   override def onResume() {
     super.onResume()
     val permissionCheck = ContextCompat.checkSelfPermission(this,
-      Manifest.permission.CAMERA)
+      android.Manifest.permission.CAMERA)
     if (permissionCheck == PackageManager.PERMISSION_GRANTED) {
       scannerView.setResultHandler(this) // Register ourselves as a handler for scan results.
       scannerView.startCamera()          // Start camera on resume
     } else {
       ActivityCompat.requestPermissions(this,
-        Array(Manifest.permission.CAMERA), MY_PERMISSIONS_REQUEST_CAMERA)
+        Array(android.Manifest.permission.CAMERA), MY_PERMISSIONS_REQUEST_CAMERA)
     }
   }
 

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

@@ -181,7 +181,7 @@ class ShadowsocksNatService extends BaseService {
     val conf = profile.route match {
       case Route.BYPASS_CHN | Route.BYPASS_LAN_CHN | Route.GFWLIST => {
         ConfigUtils.PDNSD_DIRECT.formatLocal(Locale.ENGLISH, getApplicationInfo.dataDir,
-          "127.0.0.1", profile.localPort + 53, "1.2.4.8, 114.114.114.114, 208.67.222.222", "", profile.localPort + 63, "")
+          "127.0.0.1", profile.localPort + 53, "1.2.4.8, 114.114.114.114", "", profile.localPort + 63, "")
       }
       case Route.CHINALIST => {
         ConfigUtils.PDNSD_DIRECT.formatLocal(Locale.ENGLISH, getApplicationInfo.dataDir,

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

@@ -54,11 +54,13 @@ class ShadowsocksRunnerService extends Service with ServiceBoundContext {
   }
 
   override def onServiceConnected() {
-    if (bgService != null) {
-      if (app.isNatEnabled) startBackgroundService()
-      else if (VpnService.prepare(ShadowsocksRunnerService.this) == null) startBackgroundService()
-      handler.postDelayed(() => stopSelf(), 10000)
-    }
+    handler.postDelayed(() => {
+      if (bgService != null) {
+        if (app.isNatEnabled) startBackgroundService()
+        else if (VpnService.prepare(ShadowsocksRunnerService.this) == null) startBackgroundService()
+        handler.postDelayed(() => stopSelf(), 10000)
+      }
+    }, 1000)
   }
 
   def startBackgroundService() = bgService.useSync(app.profileId)

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

@@ -282,7 +282,6 @@ class ShadowsocksVpnService extends VpnService with BaseService {
     })
     val cmd = ArrayBuffer[String](getApplicationInfo.dataDir + "/ss-tunnel"
       , "-V"
-      , "-u"
       , "-t", "10"
       , "-b", "127.0.0.1"
       , "-L", "8.8.8.8:53"
@@ -301,7 +300,7 @@ class ShadowsocksVpnService extends VpnService with BaseService {
     val conf = profile.route match {
       case Route.BYPASS_CHN | Route.BYPASS_LAN_CHN | Route.GFWLIST => {
         ConfigUtils.PDNSD_DIRECT.formatLocal(Locale.ENGLISH, getApplicationInfo.dataDir,
-          "0.0.0.0", profile.localPort + 53, "1.2.4.8, 114.114.114.114, 208.67.222.222", ipv6, profile.localPort + 63, ipv6)
+          "0.0.0.0", profile.localPort + 53, "1.2.4.8, 114.114.114.114", ipv6, profile.localPort + 63, ipv6)
       }
       case Route.CHINALIST => {
         ConfigUtils.PDNSD_DIRECT.formatLocal(Locale.ENGLISH, getApplicationInfo.dataDir,

src/main/scala/com/github/shadowsocks/utils/Constants.scala

@@ -73,7 +73,6 @@ object ConfigUtils {
       | server_ip = %s;
       | server_port = %d;
       | query_method = tcp_only;
-      | run_ipv4 = on;
       | min_ttl = 15m;
       | max_ttl = 1w;
       | timeout = 10;
@@ -87,7 +86,6 @@ object ConfigUtils {
       | %s
       | reject_policy = negate;
       | reject_recursively = on;
-      | timeout = 5;
       |}
       |
       |rr {
@@ -106,28 +104,32 @@ object ConfigUtils {
       | cache_dir = "%s";
       | server_ip = %s;
       | server_port = %d;
-      | query_method = tcp_only;
-      | run_ipv4 = on;
+      | query_method = udp_only;
       | min_ttl = 15m;
       | max_ttl = 1w;
       | timeout = 10;
       | daemon = off;
+      | par_queries = 4;
       |}
       |
       |server {
       | label = "remote-servers";
       | ip = %s;
-      | timeout = 5;
-      | uptest = none;
-      | preset = on;
+      | timeout = 3;
+      | query_method = udp_only;
       | %s
+      | reject_policy = negate;
+      | reject_recursively = on;
       |}
       |
       |server {
       | label = "local-server";
       | ip = 127.0.0.1;
+      | query_method = tcp_only;
       | port = %d;
       | %s
+      | reject_policy = negate;
+      | reject_recursively = on;
       |}
       |
       |rr {