Commit 1eda4c47 authored by Mygod's avatar Mygod

Removed the switch for now

parent c1730e4f
...@@ -32,7 +32,6 @@ ...@@ -32,7 +32,6 @@
<string name="bypass_apps_summary">启用该选项,以使所选应用程序的流量不经过代理</string> <string name="bypass_apps_summary">启用该选项,以使所选应用程序的流量不经过代理</string>
<string name="auto_connect">自动连接</string> <string name="auto_connect">自动连接</string>
<string name="auto_connect_summary">随系统启动后台服务</string> <string name="auto_connect_summary">随系统启动后台服务</string>
<string name="notification_traffic">在通知内显示当前上下行速率</string>
<string name="forward_success">后台服务已开始运行。</string> <string name="forward_success">后台服务已开始运行。</string>
<string name="service_running">影梭 → %s</string> <string name="service_running">影梭 → %s</string>
<string name="service_failed">无法连接远程服务器</string> <string name="service_failed">无法连接远程服务器</string>
......
...@@ -13,7 +13,6 @@ ...@@ -13,7 +13,6 @@
<string name="nat_summary">Use NAT mode instead of VPN mode</string> <string name="nat_summary">Use NAT mode instead of VPN mode</string>
<string name="nat_summary_no_root">NAT mode is disabled without root</string> <string name="nat_summary_no_root">NAT mode is disabled without root</string>
<string name="stat">Network Traffic</string> <string name="stat">Network Traffic</string>
<string name="notification_traffic">Show traffic in notification</string>
<string name="stat_summary">Sent: \t\t\t\t\t%3$s\t↑\t%1$s/s\nReceived: \t%4$s\t↓\t%2$s/s</string> <string name="stat_summary">Sent: \t\t\t\t\t%3$s\t↑\t%1$s/s\nReceived: \t%4$s\t↓\t%2$s/s</string>
<string name="stat_profiles">\n%1$s↑\t%2$s↓</string> <string name="stat_profiles">\n%1$s↑\t%2$s↓</string>
<string name="traffic_summary">%1$s/s↑\t%2$s/s↓</string> <string name="traffic_summary">%1$s/s↑\t%2$s/s↓</string>
......
...@@ -82,8 +82,6 @@ ...@@ -82,8 +82,6 @@
android:key="isAutoConnect" android:key="isAutoConnect"
android:summary="@string/auto_connect_summary" android:summary="@string/auto_connect_summary"
android:title="@string/auto_connect"/> android:title="@string/auto_connect"/>
<SwitchPreference android:key="notificationTraffic" android:defaultValue="true"
android:title="@string/notification_traffic"/>
<com.github.shadowsocks.preferences.NatSwitchPreference android:key="isNAT" <com.github.shadowsocks.preferences.NatSwitchPreference android:key="isNAT"
android:title="@string/nat" android:title="@string/nat"
......
...@@ -452,7 +452,6 @@ class Shadowsocks ...@@ -452,7 +452,6 @@ class Shadowsocks
} }
private def setPreferenceEnabled(enabled: Boolean) { private def setPreferenceEnabled(enabled: Boolean) {
preferences.findPreference(Key.notificationTraffic).setEnabled(enabled)
preferences.findPreference(Key.isNAT).setEnabled(enabled) preferences.findPreference(Key.isNAT).setEnabled(enabled)
for (name <- Shadowsocks.PROXY_PREFS) { for (name <- Shadowsocks.PROXY_PREFS) {
val pref = preferences.findPreference(name) val pref = preferences.findPreference(name)
......
...@@ -76,8 +76,6 @@ object ShadowsocksApplication { ...@@ -76,8 +76,6 @@ object ShadowsocksApplication {
.setLabel(getVersionName) .setLabel(getVersionName)
.build()) .build())
def notificationTraffic = settings.getBoolean(Key.notificationTraffic, true)
def profileId = settings.getInt(Key.profileId, -1) def profileId = settings.getInt(Key.profileId, -1)
def profileId(i: Int) = settings.edit.putInt(Key.profileId, i).apply def profileId(i: Int) = settings.edit.putInt(Key.profileId, i).apply
def currentProfile = profileManager.getProfile(profileId) def currentProfile = profileManager.getProfile(profileId)
......
...@@ -39,25 +39,21 @@ class ShadowsocksNotification(private val service: BaseService, profileName: Str ...@@ -39,25 +39,21 @@ class ShadowsocksNotification(private val service: BaseService, profileName: Str
PendingIntent.getBroadcast(service, 0, new Intent(Action.CLOSE), 0)) PendingIntent.getBroadcast(service, 0, new Intent(Action.CLOSE), 0))
private lazy val style = new BigTextStyle(builder) private lazy val style = new BigTextStyle(builder)
private val showOnUnlock = visible && Utils.isLollipopOrAbove private val showOnUnlock = visible && Utils.isLollipopOrAbove
if (showOnUnlock || ShadowsocksApplication.notificationTraffic) { update()
update() lockReceiver = (context: Context, intent: Intent) => update(intent.getAction)
lockReceiver = (context: Context, intent: Intent) => update(intent.getAction) val screenFilter = new IntentFilter()
val screenFilter = new IntentFilter() screenFilter.addAction(Intent.ACTION_SCREEN_ON)
screenFilter.addAction(Intent.ACTION_SCREEN_ON) screenFilter.addAction(Intent.ACTION_SCREEN_OFF)
screenFilter.addAction(Intent.ACTION_SCREEN_OFF) if (showOnUnlock) screenFilter.addAction(Intent.ACTION_USER_PRESENT)
screenFilter.addAction(Intent.ACTION_USER_PRESENT) service.registerReceiver(lockReceiver, screenFilter)
service.registerReceiver(lockReceiver, screenFilter)
} else setVisible(visible).show()
def update(action: String = Intent.ACTION_SCREEN_ON) = if (service.getState == State.CONNECTED) { def update(action: String = Intent.ACTION_SCREEN_ON) = if (service.getState == State.CONNECTED) {
if (action == Intent.ACTION_SCREEN_OFF) { if (action == Intent.ACTION_SCREEN_OFF) {
if (showOnUnlock) setVisible(false) if (showOnUnlock) setVisible(false)
unregisterCallback // unregister callback to save battery unregisterCallback // unregister callback to save battery
} else if (action == Intent.ACTION_SCREEN_ON) { } else if (action == Intent.ACTION_SCREEN_ON) {
if (ShadowsocksApplication.notificationTraffic) { service.binder.registerCallback(callback)
service.binder.registerCallback(callback) callbackRegistered = true
callbackRegistered = true
} else unregisterCallback
if (!keyGuard.inKeyguardRestrictedInputMode) setVisible(showOnUnlock) if (!keyGuard.inKeyguardRestrictedInputMode) setVisible(showOnUnlock)
} else if (action == Intent.ACTION_USER_PRESENT) setVisible(showOnUnlock) } else if (action == Intent.ACTION_USER_PRESENT) setVisible(showOnUnlock)
show() show()
......
...@@ -68,7 +68,6 @@ object Key { ...@@ -68,7 +68,6 @@ object Key {
val profiles = "profiles" val profiles = "profiles"
val isNAT = "isNAT" val isNAT = "isNAT"
val route = "route" val route = "route"
val notificationTraffic = "notificationTraffic"
val stat = "stat" val stat = "stat"
val isRunning = "isRunning" val isRunning = "isRunning"
......
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