From 963d24ab6642b4dcbf9afb85ee2fb8059b122efa Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Wed, 16 Apr 2025 15:09:49 +0800
Subject: [PATCH] Optimize and improve

https://github.com/2dust/v2rayNG/commit/38193b56216f332eb20b84a8e1395c9b4a1d7f42
---
 .../v2ray/ang/service/V2RayServiceManager.kt  | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/service/V2RayServiceManager.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/service/V2RayServiceManager.kt
index 44cd257a..7ef0030b 100644
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/service/V2RayServiceManager.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/service/V2RayServiceManager.kt
@@ -229,18 +229,19 @@ object V2RayServiceManager {
                     }
                 }
             }
-            val result = if (time == -1L) {
-                service.getString(R.string.connection_test_error, errstr)
+            val result = if (time >= 0) {
+                service.getString(R.string.connection_test_available, time)
             } else {
-                buildString {
-                    append(service.getString(R.string.connection_test_available, time))
-                    SpeedtestManager.getRemoteIPInfo()?.let { ip ->
-                        append("\n$ip")
-                    }
+                service.getString(R.string.connection_test_error, errstr)
+            }
+            MessageUtil.sendMsg2UI(service, AppConfig.MSG_MEASURE_DELAY_SUCCESS, result)
+
+            // Only fetch IP info if the delay test was successful
+            if (time >= 0) {
+                SpeedtestManager.getRemoteIPInfo()?.let { ip ->
+                    MessageUtil.sendMsg2UI(service, AppConfig.MSG_MEASURE_DELAY_SUCCESS, "$result\n$ip")
                 }
             }
-
-            MessageUtil.sendMsg2UI(service, AppConfig.MSG_MEASURE_DELAY_SUCCESS, result)
         }
     }