Fix getOrDefault()

shadowsocks · Jan 24, 2017 · 6f400bf · 6f400bf
1 parent 7fe5c7f
commit 6f400bf
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/src/main/scala/com/github/shadowsocks/plugin/obfs_local/ConfigFragment.scala b/src/main/scala/com/github/shadowsocks/plugin/obfs_local/ConfigFragment.scala
@@ -13,13 +13,20 @@ class ConfigFragment extends PreferenceFragment {
 
   override def onCreatePreferences(bundle: Bundle, key: String): Unit = addPreferencesFromResource(R.xml.config)
 
+  def getOrDefault(options: PluginOptions, key: String, defaultValue: String): String = {
+    options.get(key) match {
+      case v: String => v
+      case _ => defaultValue
+    }
+  }
+
   def onInitializePluginOptions(options: PluginOptions): Unit = {
     this.options = options
     for ((key, defaultValue) <- Array(("obfs", "http"), ("obfs-host", "cloudfront.net"))) {
       val pref = findPreference(key)
       pref match {
-        case ddp: DropDownPreference => ddp.setValue(options.getOrDefault(key, defaultValue))
-        case etp: EditTextPreference => etp.setText(options.getOrDefault(key, defaultValue))
+        case ddp: DropDownPreference => ddp.setValue(getOrDefault(options, key, defaultValue))
+        case etp: EditTextPreference => etp.setText(getOrDefault(options, key, defaultValue))
       }
       pref.setOnPreferenceChangeListener((_, value) => {
         options.put(key, value.toString)