From f1062f2f45c444c070c0a94316bee724267d9eaf Mon Sep 17 00:00:00 2001 From: MrMalekfar <134326544+MrMalekfar@users.noreply.github.com> Date: Wed, 28 Feb 2024 14:51:54 +0330 Subject: [PATCH 01/17] Update AngConfigManager.kt --- .../src/main/kotlin/com/v2ray/ang/util/AngConfigManager.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/AngConfigManager.kt b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/AngConfigManager.kt index 7d408fc6..5aa87734 100644 --- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/AngConfigManager.kt +++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/AngConfigManager.kt @@ -988,8 +988,8 @@ object AngConfigManager { ) { try { val gson = GsonBuilder().setPrettyPrinting().create() - val serverList: Array = - Gson().fromJson(server, Array::class.java) + val serverList: Array = + Gson().fromJson(server, Array::class.java) if (serverList.isNotEmpty()) { var count = 0 for (srv in serverList) { From 1624ec87b28d293af9dfbb537155d79c3e9417ab Mon Sep 17 00:00:00 2001 From: MrMalekfar <134326544+MrMalekfar@users.noreply.github.com> Date: Wed, 28 Feb 2024 15:06:37 +0330 Subject: [PATCH 02/17] Update AngConfigManager.kt --- .../src/main/kotlin/com/v2ray/ang/util/AngConfigManager.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/AngConfigManager.kt b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/AngConfigManager.kt index 5aa87734..7d408fc6 100644 --- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/AngConfigManager.kt +++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/AngConfigManager.kt @@ -988,8 +988,8 @@ object AngConfigManager { ) { try { val gson = GsonBuilder().setPrettyPrinting().create() - val serverList: Array = - Gson().fromJson(server, Array::class.java) + val serverList: Array = + Gson().fromJson(server, Array::class.java) if (serverList.isNotEmpty()) { var count = 0 for (srv in serverList) { From ff261d9939c2c10ad6fd7fa06a9c9b6023be1a87 Mon Sep 17 00:00:00 2001 From: MrMalekfar <134326544+MrMalekfar@users.noreply.github.com> Date: Wed, 28 Feb 2024 15:22:57 +0330 Subject: [PATCH 03/17] Update AngConfigManager.kt --- .../src/main/kotlin/com/v2ray/ang/util/AngConfigManager.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/AngConfigManager.kt b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/AngConfigManager.kt index 7d408fc6..bb35a145 100644 --- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/AngConfigManager.kt +++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/AngConfigManager.kt @@ -988,8 +988,8 @@ object AngConfigManager { ) { try { val gson = GsonBuilder().setPrettyPrinting().create() - val serverList: Array = - Gson().fromJson(server, Array::class.java) + val serverList: Array = + Gson().fromJson(server, Array::class.java) if (serverList.isNotEmpty()) { var count = 0 for (srv in serverList) { From 5eb09aa54ea1b5faf534298d8b3c4c77f6926a04 Mon Sep 17 00:00:00 2001 From: MrMalekfar <134326544+MrMalekfar@users.noreply.github.com> Date: Wed, 28 Feb 2024 16:31:30 +0330 Subject: [PATCH 04/17] Update AngConfigManager.kt --- .../src/main/kotlin/com/v2ray/ang/util/AngConfigManager.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/AngConfigManager.kt b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/AngConfigManager.kt index bb35a145..7d408fc6 100644 --- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/AngConfigManager.kt +++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/AngConfigManager.kt @@ -988,8 +988,8 @@ object AngConfigManager { ) { try { val gson = GsonBuilder().setPrettyPrinting().create() - val serverList: Array = - Gson().fromJson(server, Array::class.java) + val serverList: Array = + Gson().fromJson(server, Array::class.java) if (serverList.isNotEmpty()) { var count = 0 for (srv in serverList) { From e80cce969659e7c11e5afd197b469f8ae760f61f Mon Sep 17 00:00:00 2001 From: MrMalekfar <134326544+MrMalekfar@users.noreply.github.com> Date: Thu, 29 Feb 2024 02:04:42 +0330 Subject: [PATCH 05/17] Update AngConfigManager.kt --- .../app/src/main/kotlin/com/v2ray/ang/util/AngConfigManager.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/AngConfigManager.kt b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/AngConfigManager.kt index 7d408fc6..7396165e 100644 --- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/AngConfigManager.kt +++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/AngConfigManager.kt @@ -1001,7 +1001,7 @@ object AngConfigManager { config.subscriptionId = subid config.fullConfig = srv val key = MmkvManager.encodeServerConfig("", config) - serverRawStorage?.encode(key, gson.toJson(srv)) + serverRawStorage?.encode(key, Gson.toJson(srv)) count += 1 } } From 486f3ffc96b5a61499df42c7c9996e8799ecb934 Mon Sep 17 00:00:00 2001 From: MrMalekfar <134326544+MrMalekfar@users.noreply.github.com> Date: Thu, 29 Feb 2024 09:23:46 +0330 Subject: [PATCH 06/17] Update AngConfigManager.kt --- .../main/kotlin/com/v2ray/ang/util/AngConfigManager.kt | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/AngConfigManager.kt b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/AngConfigManager.kt index 7396165e..2efa22f4 100644 --- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/AngConfigManager.kt +++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/AngConfigManager.kt @@ -987,7 +987,11 @@ object AngConfigManager { && server.contains("routing") ) { try { - val gson = GsonBuilder().setPrettyPrinting().create() + //val gson = GsonBuilder().setPrettyPrinting().create() + val gson = new GsonBuilder() + .setLenient() + .setPrettyPrinting() + .create(); val serverList: Array = Gson().fromJson(server, Array::class.java) if (serverList.isNotEmpty()) { @@ -1001,7 +1005,7 @@ object AngConfigManager { config.subscriptionId = subid config.fullConfig = srv val key = MmkvManager.encodeServerConfig("", config) - serverRawStorage?.encode(key, Gson.toJson(srv)) + serverRawStorage?.encode(key, gson.toJson(srv)) count += 1 } } From dc79d3a89749727a680cfaeecef76b88047d95a4 Mon Sep 17 00:00:00 2001 From: MrMalekfar <134326544+MrMalekfar@users.noreply.github.com> Date: Thu, 29 Feb 2024 09:25:06 +0330 Subject: [PATCH 07/17] Update AngConfigManager.kt --- .../main/kotlin/com/v2ray/ang/util/AngConfigManager.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/AngConfigManager.kt b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/AngConfigManager.kt index 2efa22f4..0c68b6f2 100644 --- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/AngConfigManager.kt +++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/AngConfigManager.kt @@ -988,10 +988,10 @@ object AngConfigManager { ) { try { //val gson = GsonBuilder().setPrettyPrinting().create() - val gson = new GsonBuilder() - .setLenient() - .setPrettyPrinting() - .create(); + val gson = GsonBuilder() + .setLenient() + .setPrettyPrinting() + .create(); val serverList: Array = Gson().fromJson(server, Array::class.java) if (serverList.isNotEmpty()) { From 1fa13256303d3446b62e85cf69926372c677bf24 Mon Sep 17 00:00:00 2001 From: MrMalekfar <134326544+MrMalekfar@users.noreply.github.com> Date: Thu, 29 Feb 2024 09:50:31 +0330 Subject: [PATCH 08/17] Update AngConfigManager.kt --- .../app/src/main/kotlin/com/v2ray/ang/util/AngConfigManager.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/AngConfigManager.kt b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/AngConfigManager.kt index 0c68b6f2..cdab11ad 100644 --- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/AngConfigManager.kt +++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/AngConfigManager.kt @@ -990,7 +990,6 @@ object AngConfigManager { //val gson = GsonBuilder().setPrettyPrinting().create() val gson = GsonBuilder() .setLenient() - .setPrettyPrinting() .create(); val serverList: Array = Gson().fromJson(server, Array::class.java) From 0e9f1983413011821f8583317bb88148c9818091 Mon Sep 17 00:00:00 2001 From: MrMalekfar <134326544+MrMalekfar@users.noreply.github.com> Date: Thu, 29 Feb 2024 09:59:58 +0330 Subject: [PATCH 09/17] Update AngConfigManager.kt --- .../app/src/main/kotlin/com/v2ray/ang/util/AngConfigManager.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/AngConfigManager.kt b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/AngConfigManager.kt index cdab11ad..abfcfe4e 100644 --- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/AngConfigManager.kt +++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/AngConfigManager.kt @@ -989,6 +989,7 @@ object AngConfigManager { try { //val gson = GsonBuilder().setPrettyPrinting().create() val gson = GsonBuilder() + .setObjectToNumberStrategy(ToNumberPolicy.LONG_OR_DOUBLE) .setLenient() .create(); val serverList: Array = From cfb756723c0eddf00cf0660a972eaa5acc1c7b97 Mon Sep 17 00:00:00 2001 From: MrMalekfar <134326544+MrMalekfar@users.noreply.github.com> Date: Thu, 29 Feb 2024 11:07:39 +0330 Subject: [PATCH 10/17] Update AngConfigManager.kt --- .../src/main/kotlin/com/v2ray/ang/util/AngConfigManager.kt | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/AngConfigManager.kt b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/AngConfigManager.kt index abfcfe4e..bced6d03 100644 --- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/AngConfigManager.kt +++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/AngConfigManager.kt @@ -988,10 +988,7 @@ object AngConfigManager { ) { try { //val gson = GsonBuilder().setPrettyPrinting().create() - val gson = GsonBuilder() - .setObjectToNumberStrategy(ToNumberPolicy.LONG_OR_DOUBLE) - .setLenient() - .create(); + val gson = GsonBuilder().create(); val serverList: Array = Gson().fromJson(server, Array::class.java) if (serverList.isNotEmpty()) { From 0d12cc5dc8d2935a11abc9f887dc5bb402924e8a Mon Sep 17 00:00:00 2001 From: MrMalekfar <134326544+MrMalekfar@users.noreply.github.com> Date: Thu, 29 Feb 2024 13:55:52 +0330 Subject: [PATCH 11/17] Update AngConfigManager.kt --- .../main/kotlin/com/v2ray/ang/util/AngConfigManager.kt | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/AngConfigManager.kt b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/AngConfigManager.kt index bced6d03..9a3c8da7 100644 --- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/AngConfigManager.kt +++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/AngConfigManager.kt @@ -988,9 +988,13 @@ object AngConfigManager { ) { try { //val gson = GsonBuilder().setPrettyPrinting().create() - val gson = GsonBuilder().create(); - val serverList: Array = - Gson().fromJson(server, Array::class.java) + //val serverList: Array = + //Gson().fromJson(server, Array::class.java) + val gson = Gson() + // Assuming your JSON is an array of V2rayConfig objects + val typeToken: Type = object : TypeToken>() {}.type + val serverList: List = gson.fromJson(server, typeToken) + if (serverList.isNotEmpty()) { var count = 0 for (srv in serverList) { From 6c76ddd145d12e4c74e0ff47a288141845e59cd3 Mon Sep 17 00:00:00 2001 From: MrMalekfar <134326544+MrMalekfar@users.noreply.github.com> Date: Thu, 29 Feb 2024 14:12:19 +0330 Subject: [PATCH 12/17] Update AngConfigManager.kt --- .../app/src/main/kotlin/com/v2ray/ang/util/AngConfigManager.kt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/AngConfigManager.kt b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/AngConfigManager.kt index 9a3c8da7..d4883f70 100644 --- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/AngConfigManager.kt +++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/AngConfigManager.kt @@ -8,6 +8,7 @@ import android.util.Log import androidx.preference.PreferenceManager import com.google.gson.Gson import com.google.gson.GsonBuilder +import com.google.gson.reflect.TypeToken import com.tencent.mmkv.MMKV import com.v2ray.ang.AppConfig import com.v2ray.ang.AppConfig.ANG_CONFIG @@ -22,6 +23,7 @@ import com.v2ray.ang.dto.V2rayConfig.Companion.TLS import com.v2ray.ang.util.MmkvManager.KEY_SELECTED_SERVER import java.net.URI import java.util.* +import java.lang.reflect.Type import com.v2ray.ang.extension.idnHost import com.v2ray.ang.extension.removeWhiteSpace From 51b32a030a7a001e792e8e3bcca4bade54429f43 Mon Sep 17 00:00:00 2001 From: MrMalekfar <134326544+MrMalekfar@users.noreply.github.com> Date: Thu, 29 Feb 2024 14:15:05 +0330 Subject: [PATCH 13/17] Update AngConfigManager.kt --- .../app/src/main/kotlin/com/v2ray/ang/util/AngConfigManager.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/AngConfigManager.kt b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/AngConfigManager.kt index d4883f70..a97fb6eb 100644 --- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/AngConfigManager.kt +++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/AngConfigManager.kt @@ -995,7 +995,7 @@ object AngConfigManager { val gson = Gson() // Assuming your JSON is an array of V2rayConfig objects val typeToken: Type = object : TypeToken>() {}.type - val serverList: List = gson.fromJson(server, typeToken) + val serverList: List = gson.fromJson>(server, typeToken) // Use generics for clarity if (serverList.isNotEmpty()) { var count = 0 From cc7bdefe540b0fb874bf4ce6f252faca6d7472c3 Mon Sep 17 00:00:00 2001 From: MrMalekfar <134326544+MrMalekfar@users.noreply.github.com> Date: Fri, 1 Mar 2024 01:27:59 +0330 Subject: [PATCH 14/17] Update AngConfigManager.kt --- .../com/v2ray/ang/util/AngConfigManager.kt | 22 +++++++++++++------ 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/AngConfigManager.kt b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/AngConfigManager.kt index a97fb6eb..fa6ad81a 100644 --- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/AngConfigManager.kt +++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/AngConfigManager.kt @@ -990,12 +990,20 @@ object AngConfigManager { ) { try { //val gson = GsonBuilder().setPrettyPrinting().create() - //val serverList: Array = - //Gson().fromJson(server, Array::class.java) - val gson = Gson() + val gson = GsonBuilder() + .setPrettyPrinting() + .disableHtmlEscaping() + .registerTypeAdapter( // custom serialiser is needed here since JSON by default parse number as Double, core will fail to start + object : TypeToken() {}.type, + JsonSerializer { src: Double?, _: Type?, _: JsonSerializationContext? -> JsonPrimitive(src?.toInt()) } + ) + .create() + val serverList: Array = + Gson().fromJson(server, Array::class.java) + //val gson = Gson() // Assuming your JSON is an array of V2rayConfig objects - val typeToken: Type = object : TypeToken>() {}.type - val serverList: List = gson.fromJson>(server, typeToken) // Use generics for clarity + //val typeToken: Type = object : TypeToken>() {}.type + //val serverList: List = gson.fromJson>(server, typeToken) // Use generics for clarity if (serverList.isNotEmpty()) { var count = 0 @@ -1022,8 +1030,8 @@ object AngConfigManager { val config = ServerConfig.create(EConfigType.CUSTOM) config.subscriptionId = subid config.fullConfig = Gson().fromJson(server, V2rayConfig::class.java) - config.remarks = System.currentTimeMillis().toString() - // config.remarks = config.fullConfig?.remarks ?: System.currentTimeMillis().toString() + //config.remarks = System.currentTimeMillis().toString() + config.remarks = config.fullConfig?.remarks ?: System.currentTimeMillis().toString() val key = MmkvManager.encodeServerConfig("", config) serverRawStorage?.encode(key, server) return 1 From d86e68c77ac40f5b087982779115ab11bacf71e8 Mon Sep 17 00:00:00 2001 From: MrMalekfar <134326544+MrMalekfar@users.noreply.github.com> Date: Fri, 1 Mar 2024 01:51:08 +0330 Subject: [PATCH 15/17] Update AngConfigManager.kt --- .../src/main/kotlin/com/v2ray/ang/util/AngConfigManager.kt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/AngConfigManager.kt b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/AngConfigManager.kt index fa6ad81a..1b31b031 100644 --- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/AngConfigManager.kt +++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/AngConfigManager.kt @@ -8,6 +8,11 @@ import android.util.Log import androidx.preference.PreferenceManager import com.google.gson.Gson import com.google.gson.GsonBuilder +import com.google.gson.JsonPrimitive +import com.google.gson.JsonSerializationContext +import com.google.gson.JsonSerializer +import com.google.gson.annotations.SerializedName +import com.google.gson.reflect.TypeToken import com.google.gson.reflect.TypeToken import com.tencent.mmkv.MMKV import com.v2ray.ang.AppConfig From 3994810c4e46f28f0cff28f31212c22b91db7dae Mon Sep 17 00:00:00 2001 From: MrMalekfar <134326544+MrMalekfar@users.noreply.github.com> Date: Fri, 1 Mar 2024 02:06:36 +0330 Subject: [PATCH 16/17] Update AngConfigManager.kt --- .../app/src/main/kotlin/com/v2ray/ang/util/AngConfigManager.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/AngConfigManager.kt b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/AngConfigManager.kt index 1b31b031..a8569f18 100644 --- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/AngConfigManager.kt +++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/AngConfigManager.kt @@ -13,7 +13,6 @@ import com.google.gson.JsonSerializationContext import com.google.gson.JsonSerializer import com.google.gson.annotations.SerializedName import com.google.gson.reflect.TypeToken -import com.google.gson.reflect.TypeToken import com.tencent.mmkv.MMKV import com.v2ray.ang.AppConfig import com.v2ray.ang.AppConfig.ANG_CONFIG From 19cd24c37ae4b172d90e17fe4a05c843c3fce311 Mon Sep 17 00:00:00 2001 From: MrMalekfar <134326544+MrMalekfar@users.noreply.github.com> Date: Fri, 1 Mar 2024 02:35:56 +0330 Subject: [PATCH 17/17] Update AngConfigManager.kt --- .../kotlin/com/v2ray/ang/util/AngConfigManager.kt | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/AngConfigManager.kt b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/AngConfigManager.kt index a8569f18..4fc28db9 100644 --- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/AngConfigManager.kt +++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/AngConfigManager.kt @@ -1002,12 +1002,8 @@ object AngConfigManager { JsonSerializer { src: Double?, _: Type?, _: JsonSerializationContext? -> JsonPrimitive(src?.toInt()) } ) .create() - val serverList: Array = - Gson().fromJson(server, Array::class.java) - //val gson = Gson() - // Assuming your JSON is an array of V2rayConfig objects - //val typeToken: Type = object : TypeToken>() {}.type - //val serverList: List = gson.fromJson>(server, typeToken) // Use generics for clarity + val serverList: Array = + Gson().fromJson(server, Array::class.java) if (serverList.isNotEmpty()) { var count = 0 @@ -1034,8 +1030,8 @@ object AngConfigManager { val config = ServerConfig.create(EConfigType.CUSTOM) config.subscriptionId = subid config.fullConfig = Gson().fromJson(server, V2rayConfig::class.java) - //config.remarks = System.currentTimeMillis().toString() - config.remarks = config.fullConfig?.remarks ?: System.currentTimeMillis().toString() + config.remarks = System.currentTimeMillis().toString() + //config.remarks = config.fullConfig?.remarks ?: System.currentTimeMillis().toString() val key = MmkvManager.encodeServerConfig("", config) serverRawStorage?.encode(key, server) return 1