From 536fe92c83aa39c3f891cbe80dff7fba03712b4f Mon Sep 17 00:00:00 2001 From: Mygod Date: Tue, 16 Aug 2016 11:23:21 +0800 Subject: [PATCH] Refine #806 --- .../scala/com/github/shadowsocks/ShadowsocksNatService.scala | 2 +- .../scala/com/github/shadowsocks/ShadowsocksVpnService.scala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/scala/com/github/shadowsocks/ShadowsocksNatService.scala b/src/main/scala/com/github/shadowsocks/ShadowsocksNatService.scala index 5dd68353..6af63b31 100644 --- a/src/main/scala/com/github/shadowsocks/ShadowsocksNatService.scala +++ b/src/main/scala/com/github/shadowsocks/ShadowsocksNatService.scala @@ -122,7 +122,7 @@ class ShadowsocksNatService extends BaseService { cmd += (getApplicationInfo.dataDir + "/kcptun" , "-r", profile.host + ":" + profile.kcpPort , "-l", "127.0.0.1:" + (profile.localPort + 90) - , profile.kcpcli.trim.replaceAll("[\"']", "")) + , profile.kcpcli.replaceAll("^\\s*([\"'])(.*)\\1\\s*$", "$2")) if (BuildConfig.DEBUG) Log.d(TAG, cmd.mkString(" ")) diff --git a/src/main/scala/com/github/shadowsocks/ShadowsocksVpnService.scala b/src/main/scala/com/github/shadowsocks/ShadowsocksVpnService.scala index f74bba1f..ee053941 100644 --- a/src/main/scala/com/github/shadowsocks/ShadowsocksVpnService.scala +++ b/src/main/scala/com/github/shadowsocks/ShadowsocksVpnService.scala @@ -211,7 +211,7 @@ class ShadowsocksVpnService extends VpnService with BaseService { , "-r", profile.host + ":" + profile.kcpPort , "-l", "127.0.0.1:" + (profile.localPort + 90) , "--path", getApplicationInfo.dataDir + "/protect_path" - , profile.kcpcli.trim.replaceAll("[\"']", "")) + , profile.kcpcli.replaceAll("^\\s*([\"'])(.*)\\1\\s*$", "$2")) if (BuildConfig.DEBUG) Log.d(TAG, cmd.mkString(" "))