rkp/v2rayNG
1
0 Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Update AngConfigManager.kt

Browse Source
This commit is contained in:
MrMalekfar authored and GitHub committed 2024-03-01 02:35:56 +03:30
1 parent 3994810c4e
commit 19cd24c37a
1 file changed
+4 -8
Download Patch File Download Diff File Expand all files Collapse all files
V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/AngConfigManager.kt
+4 -8
View File
@@ -1002,12 +1002,8 @@ object AngConfigManager {
JsonSerializer { src: Double?, _: Type?, _: JsonSerializationContext? -> JsonPrimitive(src?.toInt()) } JsonSerializer { src: Double?, _: Type?, _: JsonSerializationContext? -> JsonPrimitive(src?.toInt()) }
) )
.create() .create()
val serverList: Array<V2rayConfig> = val serverList: Array<V2rayConfig> =
Gson().fromJson(server, Array<V2rayConfig>::class.java) Gson().fromJson(server, Array<V2rayConfig>::class.java)
//val gson = Gson()
// Assuming your JSON is an array of V2rayConfig objects
//val typeToken: Type = object : TypeToken<List<V2rayConfig>>() {}.type
//val serverList: List<V2rayConfig> = gson.fromJson<List<V2rayConfig>>(server, typeToken) // Use generics for clarity
if (serverList.isNotEmpty()) { if (serverList.isNotEmpty()) {
var count = 0 var count = 0
@@ -1034,8 +1030,8 @@ object AngConfigManager {
val config = ServerConfig.create(EConfigType.CUSTOM) val config = ServerConfig.create(EConfigType.CUSTOM)
config.subscriptionId = subid config.subscriptionId = subid
config.fullConfig = Gson().fromJson(server, V2rayConfig::class.java) config.fullConfig = Gson().fromJson(server, V2rayConfig::class.java)
//config.remarks = System.currentTimeMillis().toString() config.remarks = System.currentTimeMillis().toString()
config.remarks = config.fullConfig?.remarks ?: System.currentTimeMillis().toString() //config.remarks = config.fullConfig?.remarks ?: System.currentTimeMillis().toString()
val key = MmkvManager.encodeServerConfig("", config) val key = MmkvManager.encodeServerConfig("", config)
serverRawStorage?.encode(key, server) serverRawStorage?.encode(key, server)
return 1 return 1