From 5afb8b9cd443bfaf5468c2dbb939c07825e113d3 Mon Sep 17 00:00:00 2001
From: Mygod <mygodstudio@gmail.com>
Date: Sun, 5 Jun 2016 12:20:48 +0800
Subject: [PATCH] Fix connection test disappearing

---
 src/main/scala/com/github/shadowsocks/Shadowsocks.scala | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/scala/com/github/shadowsocks/Shadowsocks.scala b/src/main/scala/com/github/shadowsocks/Shadowsocks.scala
index 166974d6..f046eecf 100644
--- a/src/main/scala/com/github/shadowsocks/Shadowsocks.scala
+++ b/src/main/scala/com/github/shadowsocks/Shadowsocks.scala
@@ -177,7 +177,7 @@ class Shadowsocks extends AppCompatActivity with ServiceBoundContext {
   override def onServiceConnected() {
     // Update the UI
     if (fab != null) fab.setEnabled(true)
-    updateState()
+    updateState(true)
     if (Build.VERSION.SDK_INT >= 21 && app.isNatEnabled) {
       val snackbar = Snackbar.make(findViewById(android.R.id.content), R.string.nat_deprecated, Snackbar.LENGTH_LONG)
       snackbar.setAction(R.string.switch_to_vpn, (_ => preferences.natSwitch.setChecked(false)): View.OnClickListener)
@@ -444,7 +444,7 @@ class Shadowsocks extends AppCompatActivity with ServiceBoundContext {
     }
   }
 
-  private def updateState() {
+  private def updateState(initial: Boolean = false) {
     if (bgService != null) {
       bgService.getState match {
         case State.CONNECTING =>
@@ -461,7 +461,7 @@ class Shadowsocks extends AppCompatActivity with ServiceBoundContext {
           preferences.setEnabled(false)
           fabProgressCircle.postDelayed(hideCircle, 100)
           stat.setVisibility(View.VISIBLE)
-          if (app.isNatEnabled) connectionTestText.setVisibility(View.GONE) else {
+          if (initial) if (app.isNatEnabled) connectionTestText.setVisibility(View.GONE) else {
             connectionTestText.setVisibility(View.VISIBLE)
             connectionTestText.setText(getString(R.string.connection_test_pending))
           }