From 461a0bda3f4aad064b68086499fd2932eb815a37 Mon Sep 17 00:00:00 2001 From: Mygod Date: Tue, 24 May 2016 11:46:31 +0800 Subject: [PATCH] Remove unnecessary app.settings param in ConfigUtils.load --- .../com/github/shadowsocks/Shadowsocks.scala | 2 +- .../ShadowsocksRunnerActivity.scala | 4 +-- .../ShadowsocksRunnerService.scala | 4 +-- .../shadowsocks/utils/ConfigUtils.scala | 32 +++++++++---------- 4 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/main/scala/com/github/shadowsocks/Shadowsocks.scala b/src/main/scala/com/github/shadowsocks/Shadowsocks.scala index de72ce03..abf21ecb 100644 --- a/src/main/scala/com/github/shadowsocks/Shadowsocks.scala +++ b/src/main/scala/com/github/shadowsocks/Shadowsocks.scala @@ -605,7 +605,7 @@ class Shadowsocks extends AppCompatActivity with ServiceBoundContext { /** Called when connect button is clicked. */ def serviceLoad() { - bgService.use(ConfigUtils.load(app.settings)) + bgService.use(ConfigUtils.loadFromSharedPreferences) if (app.isVpnEnabled) { changeSwitch(checked = false) diff --git a/src/main/scala/com/github/shadowsocks/ShadowsocksRunnerActivity.scala b/src/main/scala/com/github/shadowsocks/ShadowsocksRunnerActivity.scala index dd6f7e82..58c164ba 100644 --- a/src/main/scala/com/github/shadowsocks/ShadowsocksRunnerActivity.scala +++ b/src/main/scala/com/github/shadowsocks/ShadowsocksRunnerActivity.scala @@ -73,7 +73,7 @@ class ShadowsocksRunnerActivity extends Activity with ServiceBoundContext { onActivityResult(REQUEST_CONNECT, Activity.RESULT_OK, null) } } else { - bgService.use(ConfigUtils.load(app.settings)) + bgService.use(ConfigUtils.loadFromSharedPreferences) finish() } } @@ -109,7 +109,7 @@ class ShadowsocksRunnerActivity extends Activity with ServiceBoundContext { resultCode match { case Activity.RESULT_OK => if (bgService != null) { - bgService.use(ConfigUtils.load(app.settings)) + bgService.use(ConfigUtils.loadFromSharedPreferences) } case _ => Log.e(TAG, "Failed to start VpnService") diff --git a/src/main/scala/com/github/shadowsocks/ShadowsocksRunnerService.scala b/src/main/scala/com/github/shadowsocks/ShadowsocksRunnerService.scala index 078075ed..daa8a7cc 100644 --- a/src/main/scala/com/github/shadowsocks/ShadowsocksRunnerService.scala +++ b/src/main/scala/com/github/shadowsocks/ShadowsocksRunnerService.scala @@ -62,11 +62,11 @@ class ShadowsocksRunnerService extends Service with ServiceBoundContext { val intent = VpnService.prepare(ShadowsocksRunnerService.this) if (intent == null) { if (bgService != null) { - bgService.use(ConfigUtils.load(app.settings)) + bgService.use(ConfigUtils.loadFromSharedPreferences) } } } else { - bgService.use(ConfigUtils.load(app.settings)) + bgService.use(ConfigUtils.loadFromSharedPreferences) } stopSelf() } diff --git a/src/main/scala/com/github/shadowsocks/utils/ConfigUtils.scala b/src/main/scala/com/github/shadowsocks/utils/ConfigUtils.scala index 303c9d9e..c71bddf8 100644 --- a/src/main/scala/com/github/shadowsocks/utils/ConfigUtils.scala +++ b/src/main/scala/com/github/shadowsocks/utils/ConfigUtils.scala @@ -39,7 +39,7 @@ package com.github.shadowsocks.utils -import android.content.{Context, SharedPreferences} +import android.content.Context import com.github.kevinsawicki.http.HttpRequest import com.github.shadowsocks.R import com.github.shadowsocks.ShadowsocksApplication.app @@ -200,24 +200,24 @@ object ConfigUtils { config.profileName, host, password, method, config.proxiedAppString, config.route, port, config.localPort, 0) } - def load(settings: SharedPreferences): Config = { - val isProxyApps = settings.getBoolean(Key.isProxyApps, false) - val isBypassApps = settings.getBoolean(Key.isBypassApps, false) - val isUdpDns = settings.getBoolean(Key.isUdpDns, false) - val isAuth = settings.getBoolean(Key.isAuth, false) - val isIpv6 = settings.getBoolean(Key.isIpv6, false) + def loadFromSharedPreferences = { + val isProxyApps = app.settings.getBoolean(Key.isProxyApps, false) + val isBypassApps = app.settings.getBoolean(Key.isBypassApps, false) + val isUdpDns = app.settings.getBoolean(Key.isUdpDns, false) + val isAuth = app.settings.getBoolean(Key.isAuth, false) + val isIpv6 = app.settings.getBoolean(Key.isIpv6, false) - val profileName = settings.getString(Key.profileName, "default") - 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 profileName = app.settings.getString(Key.profileName, "default") + val proxy = app.settings.getString(Key.proxy, "127.0.0.1") + val sitekey = app.settings.getString(Key.sitekey, "default") + val encMethod = app.settings.getString(Key.encMethod, "table") + val route = app.settings.getString(Key.route, "all") - val remotePort = settings.getInt(Key.remotePort, 1984) - val localPort = settings.getInt(Key.localPort, 1984) - val proxiedAppString = settings.getString(Key.proxied, "") + val remotePort = app.settings.getInt(Key.remotePort, 1984) + val localPort = app.settings.getInt(Key.localPort, 1984) + val proxiedAppString = app.settings.getString(Key.proxied, "") - val profileId = settings.getInt(Key.profileId, -1) + val profileId = app.settings.getInt(Key.profileId, -1) new Config(isProxyApps, isBypassApps, isUdpDns, isAuth, isIpv6, profileName, proxy, sitekey, encMethod, proxiedAppString, route, remotePort, localPort, profileId)