Add chacha20-ietf

src/main/AndroidManifest.xml

@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.github.shadowsocks"
-          android:versionCode="125"
-          android:versionName="2.9.3">
+          android:versionCode="126"
+          android:versionName="2.9.4">
 
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>

src/main/res/values/arrays.xml

@@ -18,6 +18,7 @@
         <item>SEED-CFB</item>
         <item>SALSA20</item>
         <item>CHACHA20</item>
+        <item>CHACHA20-IETF</item>
     </string-array>
 
     <string-array name="enc_method_value">
@@ -38,6 +39,7 @@
         <item>seed-cfb</item>
         <item>salsa20</item>
         <item>chacha20</item>
+        <item>chacha20-ietf</item>
     </string-array>
 
     <string-array name="route_entry">

src/main/scala/com/github/shadowsocks/BaseService.scala

@@ -51,10 +51,10 @@ trait BaseService extends Service {
 
   @volatile private var state = State.STOPPED
   @volatile private var callbackCount = 0
+  @volatile protected var config: Config = null
 
   var timer: Timer = null
   var trafficMonitorThread: TrafficMonitorThread = null
-  var config: Config = null
 
   final val callbacks = new RemoteCallbackList[IShadowsocksServiceCallback]
 
@@ -87,7 +87,6 @@ trait BaseService extends Service {
           val task = new TimerTask {
             def run {
               TrafficMonitor.updateRate()
-              updateTrafficTotal(TrafficMonitor.getDeltaTx, TrafficMonitor.getDeltaRx)
               updateTrafficRate(TrafficMonitor.getTxRate, TrafficMonitor.getRxRate,
                 TrafficMonitor.getTxTotal, TrafficMonitor.getRxTotal)
             }

src/main/scala/com/github/shadowsocks/ShadowsocksApplication.scala

@@ -45,6 +45,7 @@ import java.util.concurrent.TimeUnit
 import android.app.Application
 import android.content.pm.PackageManager
 import android.preference.PreferenceManager
+import com.j256.ormlite.logger.LocalLog
 import com.github.shadowsocks.database.{DBHelper, ProfileManager}
 import com.github.shadowsocks.utils.{Key, Utils}
 import com.google.android.gms.analytics.{GoogleAnalytics, HitBuilders}
@@ -89,6 +90,7 @@ class ShadowsocksApplication extends Application {
   import ShadowsocksApplication._
 
   override def onCreate() {
+    java.lang.System.setProperty(LocalLog.LOCAL_LOG_LEVEL_PROPERTY, "ERROR");
     ShadowsocksApplication.instance = this
     val tm = TagManager.getInstance(this)
     val pending = tm.loadContainerPreferNonDefault("GTM-NT8WS8", R.raw.gtm_default_container)

src/main/scala/com/github/shadowsocks/preferences/SummaryPreference.scala

@@ -1,5 +1,7 @@
 package com.github.shadowsocks.preferences
 
+import java.util.Locale
+
 import android.preference.Preference
 
 /**
@@ -15,5 +17,5 @@ trait SummaryPreference extends Preference {
     *
     * @return the summary with appropriate string substitution
     */
-  override def getSummary = String.format(super.getSummary.toString, getSummaryValue)
+  override def getSummary = super.getSummary.toString.formatLocal(Locale.ENGLISH, getSummaryValue)
 }