From 6fd94b53f035d9ee3afe42a058bc7298b0145157 Mon Sep 17 00:00:00 2001
From: Tamim Hossain <132823494+CodeWithTamim@users.noreply.github.com>
Date: Thu, 1 Aug 2024 18:17:02 +0600
Subject: [PATCH] Refactor charset usage and consolidate function
 implementation (#3398)

- Updated charset usage from string literal "UTF_8" to standard `Charsets.UTF_8`.
- Consolidated the implementation of the `getDelayTestUrl()` function.
- Improved code readability and consistency with these changes.
---
 .../main/kotlin/com/v2ray/ang/util/Utils.kt   | 22 ++++++++-----------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/Utils.kt b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/Utils.kt
index 385b7eed..6d580a48 100644
--- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/Utils.kt
+++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/Utils.kt
@@ -112,12 +112,12 @@ object Utils {
 
     fun tryDecodeBase64(text: String?): String? {
         try {
-            return Base64.decode(text, Base64.NO_WRAP).toString(charset("UTF-8"))
+            return Base64.decode(text, Base64.NO_WRAP).toString(Charsets.UTF_8)
         } catch (e: Exception) {
             Log.i(ANG_PACKAGE, "Parse base64 standard failed $e")
         }
         try {
-            return Base64.decode(text, Base64.NO_WRAP.or(Base64.URL_SAFE)).toString(charset("UTF-8"))
+            return Base64.decode(text, Base64.NO_WRAP.or(Base64.URL_SAFE)).toString(Charsets.UTF_8)
         } catch (e: Exception) {
             Log.i(ANG_PACKAGE, "Parse base64 url safe failed $e")
         }
@@ -129,7 +129,7 @@ object Utils {
      */
     fun encode(text: String): String {
         return try {
-            Base64.encodeToString(text.toByteArray(charset("UTF-8")), Base64.NO_WRAP)
+            Base64.encodeToString(text.toByteArray(Charsets.UTF_8), Base64.NO_WRAP)
         } catch (e: Exception) {
             e.printStackTrace()
             ""
@@ -288,7 +288,7 @@ object Utils {
 
     fun urlDecode(url: String): String {
         return try {
-            URLDecoder.decode(url, "UTF-8")
+            URLDecoder.decode(url, Charsets.UTF_8.toString())
         } catch (e: Exception) {
             e.printStackTrace()
             url
@@ -297,7 +297,7 @@ object Utils {
 
     fun urlEncode(url: String): String {
         return try {
-            URLEncoder.encode(url, "UTF-8")
+            URLEncoder.encode(url, Charsets.UTF_8.toString())
         } catch (e: Exception) {
             e.printStackTrace()
             url
@@ -336,7 +336,7 @@ object Utils {
     }
 
     fun getDeviceIdForXUDPBaseKey(): String {
-        val androidId = Settings.Secure.ANDROID_ID.toByteArray(charset("UTF-8"))
+        val androidId = Settings.Secure.ANDROID_ID.toByteArray(Charsets.UTF_8)
         return Base64.encodeToString(androidId.copyOf(32), Base64.NO_PADDING.or(Base64.URL_SAFE))
     }
 
@@ -449,18 +449,14 @@ object Utils {
     fun isTv(context: Context): Boolean =
         context.packageManager.hasSystemFeature(PackageManager.FEATURE_LEANBACK)
 
-    fun getDelayTestUrl(): String {
-        val url = settingsStorage.decodeString(AppConfig.PREF_DELAY_TEST_URL)
-        return if (url.isNullOrEmpty()) AppConfig.DelayTestUrl else url
-    }
-
     fun getDelayTestUrl(second: Boolean = false): String {
         return if (second) {
             AppConfig.DelayTestUrl2
         } else {
-            val url = settingsStorage.decodeString(AppConfig.PREF_DELAY_TEST_URL)
-            if (url.isNullOrEmpty()) AppConfig.DelayTestUrl else url
+            settingsStorage.decodeString(AppConfig.PREF_DELAY_TEST_URL) ?: AppConfig.DelayTestUrl
         }
     }
+
+
 }