Commit 948db260 authored by Max Lv's avatar Max Lv

bump version

parent b7c3c7d2
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.github.shadowsocks" package="com.github.shadowsocks"
android:versionCode="79" android:versionCode="80"
android:versionName="2.3.4"> android:versionName="2.4.0">
<uses-permission android:name="android.permission.INTERNET"/> <uses-permission android:name="android.permission.INTERNET"/>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
......
...@@ -128,7 +128,11 @@ object Shadowsocks { ...@@ -128,7 +128,11 @@ object Shadowsocks {
// Helper functions // Helper functions
def updateListPreference(pref: Preference, value: String) { def updateListPreference(pref: Preference, value: String) {
pref.asInstanceOf[ListPreference].setValue(value) 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) { def updatePasswordEditTextPreference(pref: Preference, value: String) {
......
...@@ -48,7 +48,11 @@ class SummaryListPreference(context: Context, attrs: AttributeSet) ...@@ -48,7 +48,11 @@ class SummaryListPreference(context: Context, attrs: AttributeSet)
override def setValue(text: String) { override def setValue(text: String) {
super.setValue(text) super.setValue(text)
setSummary(getEntry) val entry = getEntry
if (entry != null)
setSummary(entry)
else
setSummary(text)
} }
override def setSummary(summary: CharSequence) { override def setSummary(summary: CharSequence) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment