Refine Firebase code

mobile/src/main/scala/com/github/shadowsocks/BaseService.scala

@@ -127,10 +127,6 @@ 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 config = app.remoteConfig
-      val url = config.getString("proxy_url")
-      val sig = Utils.getSignature(this)
-
       val client = new OkHttpClient.Builder()
         .dns(hostname => Utils.resolve(hostname, enableIPv6 = false) match {
           case Some(ip) => util.Arrays.asList(InetAddress.getByName(ip))
@@ -141,10 +137,10 @@ trait BaseService extends Service {
         .readTimeout(30, TimeUnit.SECONDS)
         .build()
       val requestBody = new FormBody.Builder()
-        .add("sig", sig)
+        .add("sig", Utils.getSignature(this))
         .build()
       val request = new Request.Builder()
-        .url(url)
+        .url(app.remoteConfig.getString("proxy_url"))
         .post(requestBody)
         .build()
 

mobile/src/main/scala/com/github/shadowsocks/ShadowsocksApplication.scala

@@ -21,9 +21,7 @@
 package com.github.shadowsocks
 
 import java.io.{File, FileOutputStream, IOException}
-import java.util
 import java.util.Locale
-import java.util.concurrent.TimeUnit
 
 import android.annotation.SuppressLint
 import android.app.Application
@@ -38,12 +36,9 @@ import com.github.shadowsocks.acl.DonaldTrump
 import com.github.shadowsocks.database.{DBHelper, Profile, ProfileManager}
 import com.github.shadowsocks.utils.CloseUtils._
 import com.github.shadowsocks.utils._
-import com.google.android.gms.tasks.OnCompleteListener
-import com.google.android.gms.tasks.Task
 import com.google.android.gms.analytics.{GoogleAnalytics, HitBuilders, StandardExceptionParser, Tracker}
-import com.google.android.gms.common.api.ResultCallback
-import com.google.firebase.remoteconfig.FirebaseRemoteConfig
 import com.google.firebase.FirebaseApp
+import com.google.firebase.remoteconfig.FirebaseRemoteConfig
 import com.j256.ormlite.logger.LocalLog
 import eu.chainfire.libsuperuser.Shell
 
@@ -153,15 +148,7 @@ class ShadowsocksApplication extends Application {
     checkChineseLocale(getResources.getConfiguration)
 
     FirebaseApp.initializeApp(this)
-
-	remoteConfig.fetch(60)
-	  .addOnCompleteListener(new OnCompleteListener[Void]() {
-		def onComplete(task: Task[Void]) {
-		  if (task.isSuccessful()) {
-			remoteConfig.activateFetched()
-		  }
-		}
-	  })
+    remoteConfig.fetch().addOnCompleteListener(task => if (task.isSuccessful) remoteConfig.activateFetched())
 
     JobManager.create(this).addJobCreator(DonaldTrump)