bump version

This commit is contained in:
Max Lv
2014-11-17 09:39:34 +08:00
parent b7c3c7d269
commit 948db260b6
3 changed files with 12 additions and 4 deletions
+2 -2
View File
@@ -1,7 +1,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.github.shadowsocks"
android:versionCode="79"
android:versionName="2.3.4">
android:versionCode="80"
android:versionName="2.4.0">
<uses-permission android:name="android.permission.INTERNET"/>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
@@ -128,7 +128,11 @@ object Shadowsocks {
// Helper functions
def updateListPreference(pref: Preference, value: String) {
pref.asInstanceOf[ListPreference].setValue(value)
pref.setSummary(pref.asInstanceOf[ListPreference].getEntry)
val entry = pref.asInstanceOf[ListPreference].getEntry
if (entry != null)
pref.setSummary(entry)
else
pref.setSummary(value)
}
def updatePasswordEditTextPreference(pref: Preference, value: String) {
@@ -48,7 +48,11 @@ class SummaryListPreference(context: Context, attrs: AttributeSet)
override def setValue(text: String) {
super.setValue(text)
setSummary(getEntry)
val entry = getEntry
if (entry != null)
setSummary(entry)
else
setSummary(text)
}
override def setSummary(summary: CharSequence) {