From 9b2671d565810ac1308f7aa916b4ba42da5972ea Mon Sep 17 00:00:00 2001
From: Mygod <mygodstudio@gmail.com>
Date: Thu, 26 Nov 2015 09:54:02 +0800
Subject: [PATCH] Refine traffic format

---
 src/main/res/xml/pref_all.xml                             | 8 ++++----
 .../com/github/shadowsocks/utils/TrafficMonitor.scala     | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/main/res/xml/pref_all.xml b/src/main/res/xml/pref_all.xml
index 2390e8e3..20f23e2a 100644
--- a/src/main/res/xml/pref_all.xml
+++ b/src/main/res/xml/pref_all.xml
@@ -26,13 +26,13 @@
                 app:min="1"
                 app:max="65535"
                 android:key="remotePortNum"
-                app:summary="@string/remote_port_summary"
+                android:summary="@string/remote_port_summary"
                 android:title="@string/remote_port"/>
         <com.github.shadowsocks.preferences.NumberPickerPreference
                 app:min="1025"
                 app:max="65535"
                 android:key="localPortNum"
-                app:summary="@string/port_summary"
+                android:summary="@string/port_summary"
                 android:title="@string/port"/>
         <com.github.shadowsocks.preferences.PasswordEditTextPreference
                 android:inputType="textPassword"
@@ -43,7 +43,7 @@
                 android:key="encMethod"
                 app:entries="@array/enc_method_entry"
                 app:entryValues="@array/enc_method_value"
-                app:summary="%s"
+                android:summary="%s"
                 android:title="@string/enc_method"/>
         <SwitchPreference
                 android:key="isAuth"
@@ -59,7 +59,7 @@
                 android:key="route"
                 app:entries="@array/route_entry"
                 app:entryValues="@array/route_value"
-                app:summary="%s"
+                android:summary="%s"
                 android:title="@string/route_list"/>
         <SwitchPreference
                 android:key="isIpv6"
diff --git a/src/main/scala/com/github/shadowsocks/utils/TrafficMonitor.scala b/src/main/scala/com/github/shadowsocks/utils/TrafficMonitor.scala
index fe5c7bc2..d34b526f 100644
--- a/src/main/scala/com/github/shadowsocks/utils/TrafficMonitor.scala
+++ b/src/main/scala/com/github/shadowsocks/utils/TrafficMonitor.scala
@@ -27,11 +27,11 @@ object TrafficMonitor {
   }
 
   private val units = Array("KB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB", "BB", "NB", "DB", "CB")
-  private val numberFormat = new DecimalFormat("0.00")
+  private val numberFormat = new DecimalFormat("@@@")
   def formatTraffic(size: Long): String = {
     var n: Double = size
     var i = -1
-    while (n >= 1024) {
+    while (n >= 1000) {
       n /= 1024
       i = i + 1
     }
@@ -52,8 +52,8 @@ object TrafficMonitor {
   }
 
   def update(tx: Long, rx: Long) {
-    txTotal = tx;
-    rxTotal = rx;
+    txTotal = tx
+    rxTotal = rx
   }
 
   def reset() {