From 8172befb657086e2d04ef01f9c05553a1cb725ba Mon Sep 17 00:00:00 2001
From: Max Lv <max.c.lv@gmail.com>
Date: Sun, 27 Oct 2013 19:31:31 +0800
Subject: [PATCH] ready to add more public servers

---
 project/Build.scala                               |  4 ++--
 src/main/scala/com/github/shadowsocks/Utils.scala | 12 ++++++++----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/project/Build.scala b/project/Build.scala
index 2a0c8e77..566e1ac3 100644
--- a/project/Build.scala
+++ b/project/Build.scala
@@ -5,8 +5,8 @@ import sbtandroid._
 import sbtandroid.AndroidPlugin._
 
 object App {
-  val version = "2.0.1"
-  val versionCode = 52
+  val version = "2.0.2"
+  val versionCode = 53
 }
 
 object General {
diff --git a/src/main/scala/com/github/shadowsocks/Utils.scala b/src/main/scala/com/github/shadowsocks/Utils.scala
index 932c1fbb..73f59a66 100644
--- a/src/main/scala/com/github/shadowsocks/Utils.scala
+++ b/src/main/scala/com/github/shadowsocks/Utils.scala
@@ -112,10 +112,14 @@ object Config {
   }
 
   def getPublicConfig(container: Container, config: Config): Config = {
-    val host = container.getString("host")
-    val port = util.Random.shuffle(container.getString("port").split(',').toSeq).toSeq(0).toInt
-    val method = container.getString("method")
-    val password = container.getString("password")
+    val list = container.getString("proxy_list")
+    val proxies = util.Random.shuffle(list.split('|').toSeq).toSeq
+    val proxy = proxies(0).split(':')
+
+    val host = proxy(0)
+    val port = proxy(1).toInt
+    val password = proxy(2)
+    val method = proxy(3)
 
     new Config(config.isGlobalProxy, config.isGFWList, config.isBypassApps, config.isTrafficStat,
       config.profileName, host, password, method, port, config.localPort, config.proxiedAppString)