diff --git a/local.sbt.example b/local.sbt.example index 7d872a8e..994eb3be 100644 --- a/local.sbt.example +++ b/local.sbt.example @@ -3,3 +3,7 @@ import sbtandroid.AndroidPlugin._ keyalias := "travis" publicServer := "127.0.0.1" + +publicPorts := "443" + +publicMethod := "rc4" diff --git a/src/main/scala/com/github/shadowsocks/Utils.scala b/src/main/scala/com/github/shadowsocks/Utils.scala index 081a766f..dc9dc6a3 100644 --- a/src/main/scala/com/github/shadowsocks/Utils.scala +++ b/src/main/scala/com/github/shadowsocks/Utils.scala @@ -200,10 +200,16 @@ object Extra { case _ => "127.0.0.1" } val sitekey = settings.getString(Key.sitekey, "default") - val encMethod = settings.getString(Key.encMethod, "table") + val encMethod = { + if (proxy == BuildConfig.SERVER) { + BuildConfig.METHOD + } else { + settings.getString(Key.encMethod, "table") + } + } val remotePort: Int = try { if (proxy == BuildConfig.SERVER) { - scala.util.Random.shuffle(Seq(20, 21, 23)).toSeq(0) + scala.util.Random.shuffle(BuildConfig.PORTS.toSeq).toSeq(0) } else { Integer.valueOf(settings.getString(Key.remotePort, "1984")) }