From 1155c7317a80dfcfb7b6de63d3f1c88bf3228756 Mon Sep 17 00:00:00 2001
From: Max Lv <max.c.lv@gmail.com>
Date: Sun, 29 Sep 2013 17:27:45 +0800
Subject: [PATCH] fix #37

---
 src/main/res/drawable-hdpi/menu_arrow.png        | Bin 0 -> 1578 bytes
 src/main/res/drawable-mdpi/menu_arrow.png        | Bin 0 -> 869 bytes
 src/main/res/drawable-xhdpi/menu_arrow.png       | Bin 0 -> 1723 bytes
 .../com/github/shadowsocks/Shadowsocks.scala     |  14 +-------------
 4 files changed, 1 insertion(+), 13 deletions(-)
 create mode 100644 src/main/res/drawable-hdpi/menu_arrow.png
 create mode 100644 src/main/res/drawable-mdpi/menu_arrow.png
 create mode 100644 src/main/res/drawable-xhdpi/menu_arrow.png

diff --git a/src/main/res/drawable-hdpi/menu_arrow.png b/src/main/res/drawable-hdpi/menu_arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..c28d98f3bb435334b7852718214161d780896fce
GIT binary patch
literal 1578
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

literal 0
HcmV?d00001

diff --git a/src/main/res/drawable-mdpi/menu_arrow.png b/src/main/res/drawable-mdpi/menu_arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..ecacda71130fb1e1b0b2ab9afbeb05c7c14532b8
GIT binary patch
literal 869
zcmV-r1DgDaP)<h;3K|Lk000e1NJLTq000mG001Ef1^@s6(A6tx00004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10^&(TK~zYIwU$j!6Hyd~-*fM@MN1{5LmS3gDUN7t6GQ|@f*TgH
za?g?#hVTPOSU_OGUua~-hNSohSg|5NL&8Umx=<1lY)GUfO;f0p&dhNkkRqiWV!Z2l
zpPcjLo^ywo8BPxoiSF)hd31Cn{eHi-xw&bQQveZBTU(o_SS&V4DI0_k$IHvhUg0#X
z>$<y8DEOt6PlOOLP18cUu76aVgaIgpLZQj!a&-_<4*+Fxaq+#B@>N{`01*y{8%w29
zL<rGKL@&q3$Aghb<P8ASbU;KxRaLK)vQ1HxerA5#-`^iwSXgLR6h+ho5D|q!p#}i=
zEz2^55QD9)t$j;NOAl35m6zq+6xMa!&CGt=wxdMU=XSfF&&|zU30DPFN(0aVz#yU*
zv$M00ySlpM-``iOK!n5LMgS3J?gh|0JUsktXlTe&wc1JtRiq6XhVeR)NCaFiSG7Ep
ziZF#jArF9{Wm%m7`ZP`JjK||GH-#@-s3Gk^AP}G%(*VS6rB$nd+S}Xj6466u?m-=C
z*8tIIR4EpV%|!GRK(}ES(W$8^pOY{Eh?A2OK}2@|sLb3lGc%*sl6DQ?^?Ge){skaQ
zM48FS$!xh?b_|f2Ooju2fL$(^nTQ(F>GZvPKCcc83^;Ni0U(#lSzfQVB&9R~G^A3g
zMorUNVzF4=aTomODw;l@FAv}wfFv_-O-xLD-`?J~>H+|OnR$12_l$^+gb-htdF|}%
zY-eO-<j3LRVa=s^IZVvV>2$hudV2cPw(S&vwS$9$)adAFrk2zz)5y$rHk&PaJf5^^
znp*&p$z<~L^z?MW5#apT`}_OH0QQJz1Hi`o{QTEMB2jV#xUJOxvlA~WsUr2$*x1;f
zX_|Ijz&Yfa)YaA1op?OHTDOJDRsbl$V6d5pqC$usB2rdXR*Xm_^3KuYda<!`xt!{D
vyB`T5e43`E*VorS{PXMV7;p}`_J8mjjFNU<Sl(fB00000NkvXXu0mjfU!RHY

literal 0
HcmV?d00001

diff --git a/src/main/res/drawable-xhdpi/menu_arrow.png b/src/main/res/drawable-xhdpi/menu_arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..b15993723728c411ebcd61a16d4fbd718ee432d5
GIT binary patch
literal 1723
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
RdKv%#002ovPDHLkV1g_I`BVS^

literal 0
HcmV?d00001

diff --git a/src/main/scala/com/github/shadowsocks/Shadowsocks.scala b/src/main/scala/com/github/shadowsocks/Shadowsocks.scala
index 7a1a2dde..2a8d73e2 100644
--- a/src/main/scala/com/github/shadowsocks/Shadowsocks.scala
+++ b/src/main/scala/com/github/shadowsocks/Shadowsocks.scala
@@ -574,6 +574,7 @@ class Shadowsocks
         Shadowsocks.currentProfile = profileManager.reload(id)
         updatePreferenceScreen()
         menuAdapter.setActiveId(id)
+        menuAdapter.notifyDataSetChanged()
       }
     }, 600)
 
@@ -637,19 +638,6 @@ class Shadowsocks
     buf.toList
   }
 
-  override def onKeyDown(keyCode: Int, event: KeyEvent): Boolean = {
-    if (keyCode == KeyEvent.KEYCODE_BACK && event.getRepeatCount == 0) {
-      try {
-        finish()
-      } catch {
-        case ignore: Exception => {
-        }
-      }
-      return true
-    }
-    super.onKeyDown(keyCode, event)
-  }
-
   override def onOptionsItemSelected(item: MenuItem): Boolean = {
     item.getItemId match {
       case android.R.id.home => {