Skip to content

Commit

Permalink
Refine Firebase remote config
Browse files Browse the repository at this point in the history
  • Loading branch information
madeye committed Apr 28, 2017
1 parent bd782da commit 59f02cf
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 4 deletions.
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ lazy val commonSettings = Seq(
resConfigs := Seq("ja", "ko", "ru", "zh-rCN", "zh-rTW")
)

val supportLibsVersion = "25.2.0"
val supportLibsVersion = "25.3.1"
lazy val root = Project(id = "shadowsocks-android", base = file("."))
.settings(commonSettings)
.aggregate(plugin, mobile)
Expand Down
4 changes: 2 additions & 2 deletions mobile/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ enablePlugins(AndroidGms)
android.useSupportVectors

name := "shadowsocks"
version := "4.1.5"
versionCode := Some(185)
version := "4.1.6"
versionCode := Some(186)

proguardOptions ++=
"-dontwarn com.evernote.android.job.gcm.**" ::
Expand Down
7 changes: 7 additions & 0 deletions mobile/src/main/res/xml/default_configs.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<defaultsMap>
<entry>
<key>proxy_url</key>
<value>https://www.socks123.pw/get.php</value>
</entry>
</defaultsMap>
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,7 @@ trait BaseService extends Service {

def connect() {
profile.name = profile.getName // save original name before it's (possibly) overwritten by IP addresses

if (profile.host == "198.199.101.152") {
val client = new OkHttpClient.Builder()
.dns(hostname => Utils.resolve(hostname, enableIPv6 = false) match {
Expand Down Expand Up @@ -353,7 +354,7 @@ trait BaseService extends Service {
.put("PrimaryDNS", new JSONArray().put(makeDns("Primary", "119.29.29.29")))
.put("AlternativeDNS", remoteDns)
case _ => config
.put("PrimaryDNS", new JSONArray(remoteDns))
.put("PrimaryDNS", remoteDns)
// no need to setup AlternativeDNS in Acl.ALL/BYPASS_LAN mode
.put("OnlyPrimaryDNS", true)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -384,12 +384,14 @@ class MainActivity extends Activity with ServiceBoundContext with Drawer.OnDrawe
displayFragment(new AboutFragment)
case DRAWER_FAQ => launchUrl(getString(R.string.faq_url))
case DRAWER_CUSTOM_RULES => displayFragment(new CustomRulesFragment)
case _ => // ignore
}
true // unexpected cases will throw exception
}

protected override def onResume() {
super.onResume()
app.remoteConfig.fetch()
state match {
case State.STOPPING | State.CONNECTING =>
case _ => hideCircle()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,7 @@ class ShadowsocksApplication extends Application {
checkChineseLocale(getResources.getConfiguration)

FirebaseApp.initializeApp(this)
remoteConfig.setDefaults(R.xml.default_configs);
remoteConfig.fetch().addOnCompleteListener(task => if (task.isSuccessful) remoteConfig.activateFetched())

JobManager.create(this).addJobCreator(DonaldTrump)
Expand Down

0 comments on commit 59f02cf

Please sign in to comment.