update android-plugin
This commit is contained in:
+1
-1
@@ -2,4 +2,4 @@ import sbtandroid.AndroidKeys._
|
||||
|
||||
keyalias in Android := "travis"
|
||||
|
||||
buildConfigDebug in Android := true
|
||||
publicServer in Android := "127.0.0.1"
|
||||
|
||||
+2
-2
@@ -5,8 +5,8 @@ import sbtandroid._
|
||||
import sbtandroid.AndroidKeys._
|
||||
|
||||
object App {
|
||||
val version = "1.7.3"
|
||||
val versionCode = 40
|
||||
val version = "1.7.4"
|
||||
val versionCode = 41
|
||||
}
|
||||
|
||||
object General {
|
||||
|
||||
@@ -188,14 +188,18 @@ object Extra {
|
||||
val isTrafficStat = settings.getBoolean(Key.isTrafficStat, false)
|
||||
|
||||
val proxy = settings.getString(Key.proxy, "127.0.0.1") match {
|
||||
case "198.199.101.152" => if (!BuildConfig.DEBUG) "ss.maxcdn.info" else "198.199.101.152"
|
||||
case "198.199.101.152" => BuildConfig.SERVER
|
||||
case s: String => s
|
||||
case _ => "127.0.0.1"
|
||||
}
|
||||
val sitekey = settings.getString(Key.sitekey, "default")
|
||||
val encMethod = settings.getString(Key.encMethod, "table")
|
||||
val remotePort: Int = try {
|
||||
Integer.valueOf(settings.getString(Key.remotePort, "1984"))
|
||||
if (proxy == BuildConfig.SERVER) {
|
||||
scala.util.Random.shuffle(Seq(20, 21, 23, 443)).toSeq(0)
|
||||
} else {
|
||||
Integer.valueOf(settings.getString(Key.remotePort, "1984"))
|
||||
}
|
||||
} catch {
|
||||
case ex: NumberFormatException => {
|
||||
1984
|
||||
|
||||
Reference in New Issue
Block a user