From 8dcfd5a8c5afca445ea21eaaea962c01e5c63eb5 Mon Sep 17 00:00:00 2001
From: Mygod <mygodstudio@gmail.com>
Date: Sat, 26 Dec 2015 19:59:58 +0800
Subject: [PATCH] Reduce battery usage - prevent unnecessary notification
 updates

---
 .../com/github/shadowsocks/BaseService.scala  |  6 ++-
 .../shadowsocks/utils/TrafficMonitor.scala    | 37 +++++++++++++++----
 2 files changed, 34 insertions(+), 9 deletions(-)

diff --git a/src/main/scala/com/github/shadowsocks/BaseService.scala b/src/main/scala/com/github/shadowsocks/BaseService.scala
index aaaae236..777290a5 100644
--- a/src/main/scala/com/github/shadowsocks/BaseService.scala
+++ b/src/main/scala/com/github/shadowsocks/BaseService.scala
@@ -86,8 +86,7 @@ trait BaseService extends Service {
         if (callbackCount == 0 && timer == null) {
           val task = new TimerTask {
             def run {
-              TrafficMonitor.updateRate()
-              updateTrafficRate()
+              if (TrafficMonitor.updateRate()) updateTrafficRate()
             }
           }
           timer = new Timer(true)
@@ -95,6 +94,9 @@ trait BaseService extends Service {
         }
         callbacks.register(cb)
         callbackCount += 1
+        TrafficMonitor.updateRate()
+        cb.trafficUpdated(TrafficMonitor.getTxRate, TrafficMonitor.getRxRate,
+          TrafficMonitor.getTxTotal, TrafficMonitor.getRxTotal)
       }
     }
 
diff --git a/src/main/scala/com/github/shadowsocks/utils/TrafficMonitor.scala b/src/main/scala/com/github/shadowsocks/utils/TrafficMonitor.scala
index 5ae6d7fa..168fd6ed 100644
--- a/src/main/scala/com/github/shadowsocks/utils/TrafficMonitor.scala
+++ b/src/main/scala/com/github/shadowsocks/utils/TrafficMonitor.scala
@@ -18,6 +18,7 @@ object TrafficMonitor {
   var txLast: Long = _
   var rxLast: Long = _
   var timestampLast: Long = _
+  @volatile var dirty = true
 
   private val units = Array("KB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB", "BB", "NB", "DB", "CB")
   private val numberFormat = new DecimalFormat("@@@")
@@ -32,21 +33,42 @@ object TrafficMonitor {
     else numberFormat.format(n) + ' ' + units(i)
   }
 
-  def updateRate() {
+  def updateRate() = {
     val now = System.currentTimeMillis()
     val delta = now - timestampLast
+    var updated = false
     if (delta != 0) {
-      txRate = (txTotal - txLast) * 1000 / delta
-      rxRate = (rxTotal - rxLast) * 1000 / delta
-      txLast = txTotal
-      rxLast = rxTotal
+      if (dirty) {
+        txRate = (txTotal - txLast) * 1000 / delta
+        rxRate = (rxTotal - rxLast) * 1000 / delta
+        txLast = txTotal
+        rxLast = rxTotal
+        dirty = false
+        updated = true
+      } else {
+        if (txRate != 0) {
+          txRate = 0
+          updated = true
+        }
+        if (rxRate != 0) {
+          rxRate = 0
+          updated = true
+        }
+      }
       timestampLast = now
     }
+    updated
   }
 
   def update(tx: Long, rx: Long) {
-    txTotal = tx
-    rxTotal = rx
+    if (txTotal != tx) {
+      txTotal = tx
+      dirty = true
+    }
+    if (rxTotal != rx) {
+      rxTotal = rx
+      dirty = true
+    }
   }
 
   def reset() {
@@ -56,6 +78,7 @@ object TrafficMonitor {
     rxTotal = 0
     txLast = 0
     rxLast = 0
+    dirty = true
   }
 
   def getTxTotal(): String = {