Alawn/shadowsocks-android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add a toggle for showing traffic in notification.

Browse Source 
TODO: Disabling it causes weird behavior. :-(
This commit is contained in:
Mygod
2015-11-24 21:16:08 +08:00
parent 9fa57dfe4b
commit c1730e4fa6
8 changed files with 43 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/scala/com/github/shadowsocks/ShadowsocksNotification.scala
+21 -14
View File
@@ -13,8 +13,7 @@ import com.github.shadowsocks.utils.{Action, State, Utils}
/**
* @author Mygod
*/
class ShadowsocksNotification(private val service: BaseService, profileName: String, visible: Boolean = false,
private val showTraffic: Boolean = true) {
class ShadowsocksNotification(private val service: BaseService, profileName: String, visible: Boolean = false) {
private lazy val keyGuard = service.getSystemService(Context.KEYGUARD_SERVICE).asInstanceOf[KeyguardManager]
private lazy val callback = new Stub {
override def stateChanged(state: Int, msg: String) = () // ignore
@@ -26,6 +25,7 @@ class ShadowsocksNotification(private val service: BaseService, profileName: Str
}
}
private var lockReceiver: BroadcastReceiver = _
private var callbackRegistered: Boolean = true
private val builder = new NotificationCompat.Builder(service)
.setWhen(0)
@@ -39,8 +39,8 @@ class ShadowsocksNotification(private val service: BaseService, profileName: Str
PendingIntent.getBroadcast(service, 0, new Intent(Action.CLOSE), 0))
private lazy val style = new BigTextStyle(builder)
private val showOnUnlock = visible && Utils.isLollipopOrAbove
if (showOnUnlock || showTraffic) {
update(Intent.ACTION_USER_PRESENT)
if (showOnUnlock || ShadowsocksApplication.notificationTraffic) {
update()
lockReceiver = (context: Context, intent: Intent) => update(intent.getAction)
val screenFilter = new IntentFilter()
screenFilter.addAction(Intent.ACTION_SCREEN_ON)
@@ -49,32 +49,39 @@ class ShadowsocksNotification(private val service: BaseService, profileName: Str
service.registerReceiver(lockReceiver, screenFilter)
} else setVisible(visible).show()
private def update(action: String) = 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 (showOnUnlock) setVisible(false)
if (showTraffic) service.binder.unregisterCallback(callback)
} else if (action == Intent.ACTION_USER_PRESENT ||
action == Intent.ACTION_SCREEN_ON && !keyGuard.inKeyguardRestrictedInputMode) {
setVisible(showOnUnlock)
if (showTraffic) service.binder.registerCallback(callback)
}
unregisterCallback // unregister callback to save battery
} else if (action == Intent.ACTION_SCREEN_ON) {
if (ShadowsocksApplication.notificationTraffic) {
service.binder.registerCallback(callback)
callbackRegistered = true
} else unregisterCallback
if (!keyGuard.inKeyguardRestrictedInputMode) setVisible(showOnUnlock)
} else if (action == Intent.ACTION_USER_PRESENT) setVisible(showOnUnlock)
show()
}
private def unregisterCallback = if (callbackRegistered) {
service.binder.unregisterCallback(callback)
callbackRegistered = false
}
def setVisible(visible: Boolean) = {
builder.setPriority(if (visible) NotificationCompat.PRIORITY_DEFAULT else NotificationCompat.PRIORITY_MIN)
this
}
def notification = if (showTraffic) style.build() else builder.build()
def notification = if (callbackRegistered) style.build() else builder.build()
def show() = service.startForeground(1, notification)
def destroy() = {
def destroy() {
if (lockReceiver != null) {
service.unregisterReceiver(lockReceiver)
lockReceiver = null
}
if (showTraffic) service.binder.unregisterCallback(callback)
unregisterCallback
service.stopForeground(true)
}
}