update styles

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

@@ -39,7 +39,7 @@
 
 package com.github.shadowsocks
 
-import android.app.ProgressDialog
+import android.app.{Activity, ProgressDialog}
 import android.content.Context
 import android.content.SharedPreferences
 import android.content.pm.PackageManager
@@ -53,22 +53,13 @@ import android.view.View.OnClickListener
 import android.view.ViewGroup
 import android.view.ViewGroup.LayoutParams
 import android.view.WindowManager
-import android.widget.AbsListView
+import android.widget._
 import android.widget.AbsListView.OnScrollListener
-import android.widget.ArrayAdapter
-import android.widget.CheckBox
-import android.widget.CompoundButton
 import android.widget.CompoundButton.OnCheckedChangeListener
-import android.widget.ImageView
-import android.widget.ListAdapter
-import android.widget.ListView
-import android.widget.TextView
-import com.actionbarsherlock.app.SherlockActivity
 import com.nostra13.universalimageloader.core.download.BaseImageDownloader
 import java.io.{ByteArrayOutputStream, ByteArrayInputStream, InputStream}
 import com.nostra13.universalimageloader.core.{DisplayImageOptions, ImageLoader, ImageLoaderConfiguration}
 import com.nostra13.universalimageloader.core.display.FadeInBitmapDisplayer
-import org.jraf.android.backport.switchwidget.Switch
 import com.github.shadowsocks.utils.{Utils, Scheme, Key}
 
 case class ProxiedApp(uid: Int, name: String, var proxied: Boolean)
@@ -105,7 +96,7 @@ object AppManager {
   }
 }
 
-class AppManager extends SherlockActivity with OnCheckedChangeListener with OnClickListener {
+class AppManager extends Activity with OnCheckedChangeListener with OnClickListener {
 
   val MSG_LOAD_START = 1
   val MSG_LOAD_FINISH = 2
@@ -217,7 +208,7 @@ class AppManager extends SherlockActivity with OnCheckedChangeListener with OnCl
 
   protected override def onCreate(savedInstanceState: Bundle) {
     super.onCreate(savedInstanceState)
-    getSupportActionBar.setTitle(R.string.proxied_help)
+    getActionBar.setTitle(R.string.proxied_help)
     this.setContentView(R.layout.layout_apps)
     this.overlay = View.inflate(this, R.layout.overlay, null).asInstanceOf[TextView]
     getWindowManager.addView(overlay, new
@@ -232,7 +223,7 @@ class AppManager extends SherlockActivity with OnCheckedChangeListener with OnCl
         .build()
     ImageLoader.getInstance().init(config)
 
-    val bypassSwitch: Switch = findViewById(R.id.bypassSwitch).asInstanceOf[Switch]
+    val bypassSwitch = findViewById(R.id.bypassSwitch).asInstanceOf[Switch]
     val prefs: SharedPreferences = PreferenceManager.getDefaultSharedPreferences(getBaseContext)
     bypassSwitch.setOnCheckedChangeListener(new OnCheckedChangeListener {
       def onCheckedChanged(button: CompoundButton, checked: Boolean) {

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

@@ -225,18 +225,19 @@ class Shadowsocks
     }
   }
 
-  lazy val settings = PreferenceManager.getDefaultSharedPreferences(this)
-  lazy val status = getSharedPreferences(Key.status, Context.MODE_PRIVATE)
-  lazy val preferenceReceiver = new PreferenceBroadcastReceiver
-  lazy val drawer = MenuDrawer.attach(this)
-  lazy val menuAdapter = new MenuAdapter(this, getMenuList)
-  lazy val listView = new ListView(this)
-  lazy val profileManager =
+  private lazy val settings = PreferenceManager.getDefaultSharedPreferences(this)
+  private lazy val status = getSharedPreferences(Key.status, Context.MODE_PRIVATE)
+  private lazy val preferenceReceiver = new PreferenceBroadcastReceiver
+  private lazy val drawer = MenuDrawer.attach(this)
+  private lazy val menuAdapter = new MenuAdapter(this, getMenuList)
+  private lazy val listView = new ListView(this)
+  private lazy val profileManager =
     new ProfileManager(settings, getApplication.asInstanceOf[ShadowsocksApplication].dbHelper)
 
-  private lazy val handler = new Handler()
   private lazy val application = getApplication.asInstanceOf[ShadowsocksApplication]
 
+  val handler = new Handler()
+
   def isSinglePane: Boolean = {
     if (singlePane == -1) {
       val metrics = new DisplayMetrics()
@@ -518,8 +519,8 @@ class Shadowsocks
         case ignored: RemoteException => // Nothing
       }
       bgService = null
+      unbindService(connection)
     }
-    unbindService(connection)
   }
 
   override def onRestoreInstanceState(inState: Bundle) {

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

@@ -39,19 +39,16 @@
 
 package com.github.shadowsocks
 
+import java.util
 import java.util.concurrent.TimeUnit
 
 import android.app.Application
 import com.github.shadowsocks.database.DBHelper
-import com.google.android.gms.analytics.{GoogleAnalytics, Tracker}
+import com.github.shadowsocks.utils.Utils
+import com.google.android.gms.analytics.GoogleAnalytics
 import com.google.android.gms.common.api.ResultCallback
 import com.google.android.gms.tagmanager.Container.FunctionCallMacroCallback
-import com.google.android.gms.tagmanager.{ContainerHolder, TagManager, Container}
-import com.google.tagmanager.{Container, ContainerOpener, TagManager}
-import com.google.tagmanager.ContainerOpener.{Notifier, OpenType}
-import com.google.tagmanager.Container.FunctionCallMacroHandler
-import java.util
-import com.github.shadowsocks.utils.Utils
+import com.google.android.gms.tagmanager.{ContainerHolder, TagManager}
 
 class ShadowsocksApplication extends Application {
   lazy val dbHelper = new DBHelper(this)
@@ -64,7 +61,7 @@ class ShadowsocksApplication extends Application {
     val pending = tm.loadContainerPreferNonDefault("GTM-NT8WS8", R.raw.gtm_default_container)
     val callback = new ResultCallback[ContainerHolder] {
       override def onResult(holder: ContainerHolder): Unit = {
-        if (!containerHolder.getStatus.isSuccess) {
+        if (!holder.getStatus.isSuccess) {
           return
         }
         containerHolder = holder

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

@@ -39,8 +39,7 @@
 
 package com.github.shadowsocks
 
-import android.app.backup.{FileBackupHelper, SharedPreferencesBackupHelper, BackupAgentHelper}
-import android.content.Context
+import android.app.backup.{BackupAgentHelper, FileBackupHelper, SharedPreferencesBackupHelper}
 import com.github.shadowsocks.database.DBHelper
 
 class ShadowsocksBackupAgent extends BackupAgentHelper {

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

@@ -39,30 +39,26 @@
 
 package com.github.shadowsocks
 
-import android.app.Notification
-import android.app.NotificationManager
-import android.app.PendingIntent
-import android.app.Service
+import java.io.File
+import java.lang.reflect.{InvocationTargetException, Method}
+import java.util.{Timer, TimerTask}
+
+import android.app.{Notification, NotificationManager, PendingIntent, Service}
 import android.content._
-import android.content.pm.PackageInfo
-import android.content.pm.PackageManager
+import android.content.pm.{PackageInfo, PackageManager}
+import android.graphics.Color
+import android.net.TrafficStats
 import android.os._
 import android.support.v4.app.NotificationCompat
 import android.util.Log
-import java.lang.reflect.InvocationTargetException
-import java.lang.reflect.Method
+import com.github.shadowsocks.aidl.Config
+import com.github.shadowsocks.utils._
 import com.google.android.gms.analytics.HitBuilders
 import org.apache.http.conn.util.InetAddressUtils
+
 import scala.collection._
-import java.util.{TimerTask, Timer}
-import android.net.TrafficStats
-import scala.concurrent.ops._
-import com.github.shadowsocks.utils._
-import scala.Some
-import android.graphics.Color
-import com.github.shadowsocks.aidl.Config
 import scala.collection.mutable.ArrayBuffer
-import java.io.File
+import scala.concurrent.ops._
 
 case class TrafficStat(tx: Long, rx: Long, timestamp: Long)
 
@@ -275,6 +271,7 @@ class ShadowsocksNatService extends Service with BaseService {
   }
 
   def onBind(intent: Intent): IBinder = {
+    Log.d(TAG, "onBind")
     if (Action.SERVICE == intent.getAction) {
       binder
     } else {