This commit is contained in:
Max Lv
2014-11-16 21:35:54 +08:00
parent b15a4604f2
commit 9a724cd063
14 changed files with 206 additions and 117 deletions
@@ -198,7 +198,7 @@ object ConfigUtils {
val method = proxy(3).trim
new Config(config.isGlobalProxy, config.isGFWList, config.isBypassApps, config.isTrafficStat,
config.isUdpDns, config.profileName, host, password, method, config.proxiedAppString, port,
config.isUdpDns, config.profileName, host, password, method, config.proxiedAppString, config.route, port,
config.localPort)
}
@@ -213,6 +213,8 @@ object ConfigUtils {
val proxy = settings.getString(Key.proxy, "127.0.0.1")
val sitekey = settings.getString(Key.sitekey, "default")
val encMethod = settings.getString(Key.encMethod, "table")
val route = settings.getString(Key.route, "all")
val remotePort: Int = try {
settings.getString(Key.remotePort, "1984").toInt
} catch {
@@ -228,6 +230,6 @@ object ConfigUtils {
val proxiedAppString = settings.getString(Key.proxied, "")
new Config(isGlobalProxy, isGFWList, isBypassApps, isTrafficStat, isUdpDns, profileName, proxy,
sitekey, encMethod, proxiedAppString, remotePort, localPort)
sitekey, encMethod, proxiedAppString, route, remotePort, localPort)
}
}
@@ -68,6 +68,7 @@ object Key {
val isRoot = "isRoot"
val status = "status"
val proxyedApps = "proxyedApps"
val route = "route"
val isRunning = "isRunning"
val isAutoConnect = "isAutoConnect"
@@ -110,3 +111,9 @@ object Action {
val UPDATE_FRAGMENT = "com.github.shadowsocks.ACTION_UPDATE_FRAGMENT"
val UPDATE_PREFS = "com.github.shadowsocks.ACTION_UPDATE_PREFS"
}
object Route {
val ALL = "all"
val BYPASS_LAN = "bypass-lan"
val BYPASS_CHN = "bypass-china"
}