Commit 4df7634f authored by Max Lv's avatar Max Lv

fix a FC

parent 97dd8fa1
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
<string name="forward_stop">后台服务已停止。</string> <string name="forward_stop">后台服务已停止。</string>
<string name="service_failed">无法连接远程服务器</string> <string name="service_failed">无法连接远程服务器</string>
<string name="stop">停止服务</string> <string name="stop">停止服务</string>
<string name="stopping">正在关闭影梭</string> <string name="stopping">正在关闭...</string>
<string name="vpn_error">后台服务启动失败:\"%s\"。</string> <string name="vpn_error">后台服务启动失败:\"%s\"。</string>
<string name="ok_iknow">确定</string> <string name="ok_iknow">确定</string>
<string name="port_alert">端口号应大于1024</string> <string name="port_alert">端口号应大于1024</string>
......
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
<string name="forward_stop">Shadowsocks stopped.</string> <string name="forward_stop">Shadowsocks stopped.</string>
<string name="service_failed">Failed to connect the remote server</string> <string name="service_failed">Failed to connect the remote server</string>
<string name="stop">Stop the service</string> <string name="stop">Stop the service</string>
<string name="stopping">Shutting down Shadowsocks</string> <string name="stopping">Shutting down...</string>
<string name="vpn_error">Error: \"%s\".</string> <string name="vpn_error">Error: \"%s\".</string>
<!-- alert category --> <!-- alert category -->
......
...@@ -340,7 +340,7 @@ class Shadowsocks ...@@ -340,7 +340,7 @@ class Shadowsocks
Process.killProcess(pid_nat) Process.killProcess(pid_nat)
Process.killProcess(pid_vpn) Process.killProcess(pid_vpn)
} catch { } catch {
case e: Throwable => Log.e(Shadowsocks.TAG, "unable to kill " + task, e) case e: Throwable => Log.e(Shadowsocks.TAG, "unable to kill " + task)
} }
cmd.append("rm -f %s%s-nat.pid".format(Path.BASE, task)) cmd.append("rm -f %s%s-nat.pid".format(Path.BASE, task))
cmd.append("rm -f %s%s-nat.conf".format(Path.BASE, task)) cmd.append("rm -f %s%s-nat.conf".format(Path.BASE, task))
...@@ -1006,6 +1006,11 @@ class Shadowsocks ...@@ -1006,6 +1006,11 @@ class Shadowsocks
.show() .show()
} }
setPreferenceEnabled(enabled = true) setPreferenceEnabled(enabled = true)
case State.STOPPING =>
if (progressDialog == null) {
progressDialog = ProgressDialog
.show(Shadowsocks.this, "", getString(R.string.stopping), true, true)
}
} }
} }
} }
......
...@@ -354,7 +354,7 @@ class ShadowsocksNatService extends Service with BaseService { ...@@ -354,7 +354,7 @@ class ShadowsocksNatService extends Service with BaseService {
cmd.append("kill -9 %d".format(pid)) cmd.append("kill -9 %d".format(pid))
Process.killProcess(pid) Process.killProcess(pid)
} catch { } catch {
case e: Throwable => Log.e(TAG, "unable to kill " + task, e) case e: Throwable => Log.e(TAG, "unable to kill " + task)
} }
cmd.append("rm -f %s%s-nat.pid".format(Path.BASE, task)) cmd.append("rm -f %s%s-nat.pid".format(Path.BASE, task))
cmd.append("rm -f %s%s-nat.conf".format(Path.BASE, task)) cmd.append("rm -f %s%s-nat.conf".format(Path.BASE, task))
......
...@@ -368,7 +368,7 @@ class ShadowsocksVpnService extends VpnService with BaseService { ...@@ -368,7 +368,7 @@ class ShadowsocksVpnService extends VpnService with BaseService {
val pid = scala.io.Source.fromFile(Path.BASE + task + "-vpn.pid").mkString.trim.toInt val pid = scala.io.Source.fromFile(Path.BASE + task + "-vpn.pid").mkString.trim.toInt
Process.killProcess(pid) Process.killProcess(pid)
} catch { } catch {
case e: Throwable => Log.e(TAG, "unable to kill " + task, e) case e: Throwable => Log.e(TAG, "unable to kill " + task)
} }
} }
} }
......
...@@ -69,7 +69,7 @@ object Utils { ...@@ -69,7 +69,7 @@ object Utils {
val DEFAULT_ROOT: String = "/system/bin/su" val DEFAULT_ROOT: String = "/system/bin/su"
val ALTERNATIVE_ROOT: String = "/system/xbin/su" val ALTERNATIVE_ROOT: String = "/system/xbin/su"
val DEFAULT_IPTABLES: String = "/system/bin/iptables" val DEFAULT_IPTABLES: String = "/system/bin/iptables"
val ALTERNATIVE_IPTABLES: String = "/data/data/com.github.shadowsocks/iptables" val ALTERNATIVE_IPTABLES: String = "iptables"
val TIME_OUT: Int = -99 val TIME_OUT: Int = -99
var initialized: Boolean = false var initialized: Boolean = false
var hasRedirectSupport: Int = -1 var hasRedirectSupport: Int = -1
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment