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

Merge pull request #2892 from vfarid/add_remark_to_custom_configs

Browse Source 
Added remarks to all custom configs
This commit is contained in:
2dust
2024-03-03 16:59:03 +08:00
committed by GitHub
parent b02d81ae53 773bcc5658
commit 2dc82b7e83
4 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/ServerCustomConfigActivity.kt
View File

@@ -91,7 +91,7 @@ class ServerCustomConfigActivity : BaseActivity() {
} }
val config = MmkvManager.decodeServerConfig(editGuid) ?: ServerConfig.create(EConfigType.CUSTOM) val config = MmkvManager.decodeServerConfig(editGuid) ?: ServerConfig.create(EConfigType.CUSTOM)
config.remarks = binding.etRemarks.text.toString().trim() config.remarks = v2rayConfig.remarks ?: binding.etRemarks.text.toString().trim()
config.fullConfig = v2rayConfig config.fullConfig = v2rayConfig
MmkvManager.encodeServerConfig(editGuid, config) MmkvManager.encodeServerConfig(editGuid, config)

23
V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/AngConfigManager.kt
View File

@@ -1008,17 +1008,15 @@ object AngConfigManager {
if (serverList.isNotEmpty()) { if (serverList.isNotEmpty()) {
var count = 0 var count = 0
for (srv in serverList) { for (srv in serverList) {
if (srv.inbounds != null && srv.outbounds != null && srv.routing != null) { val config = ServerConfig.create(EConfigType.CUSTOM)
val config = ServerConfig.create(EConfigType.CUSTOM) config.remarks = srv.remarks
config.remarks = srv.remarks ?: ("%04d-".format(count + 1) + System.currentTimeMillis()
?: "%04d-".format(count + 1) + System.currentTimeMillis() .toString())
.toString() config.subscriptionId = subid
config.subscriptionId = subid config.fullConfig = srv
config.fullConfig = srv val key = MmkvManager.encodeServerConfig("", config)
val key = MmkvManager.encodeServerConfig("", config) serverRawStorage?.encode(key, gson.toJson(srv))
serverRawStorage?.encode(key, gson.toJson(srv)) count += 1
count += 1
}
} }
return count return count
} }
@@ -1030,8 +1028,7 @@ 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 = 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

8
V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/V2rayConfigUtil.kt
View File

@@ -49,7 +49,7 @@ object V2rayConfigUtil {
return Result(true, customConfig) return Result(true, customConfig)
} }
val outbound = config.getProxyOutbound() ?: return Result(false, "") val outbound = config.getProxyOutbound() ?: return Result(false, "")
val result = getV2rayNonCustomConfig(context, outbound) val result = getV2rayNonCustomConfig(context, outbound, config.remarks)
//Log.d(ANG_PACKAGE, result.content) //Log.d(ANG_PACKAGE, result.content)
return result return result
} catch (e: Exception) { } catch (e: Exception) {
@@ -63,7 +63,8 @@ object V2rayConfigUtil {
*/ */
private fun getV2rayNonCustomConfig( private fun getV2rayNonCustomConfig(
context: Context, context: Context,
outbound: V2rayConfig.OutboundBean outbound: V2rayConfig.OutboundBean,
remarks: String,
): Result { ): Result {
val result = Result(false, "") val result = Result(false, "")
//取得默认配置 //取得默认配置
@@ -98,6 +99,9 @@ object V2rayConfigUtil {
v2rayConfig.stats = null v2rayConfig.stats = null
v2rayConfig.policy = null v2rayConfig.policy = null
} }
v2rayConfig.remarks = remarks
result.status = true result.status = true
result.content = v2rayConfig.toPrettyPrinting() result.content = v2rayConfig.toPrettyPrinting()
return result return result

2
V2rayNG/app/src/main/kotlin/com/v2ray/ang/viewmodel/MainViewModel.kt
View File

@@ -97,9 +97,9 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
fun appendCustomConfigServer(server: String) { fun appendCustomConfigServer(server: String) {
val config = ServerConfig.create(EConfigType.CUSTOM) val config = ServerConfig.create(EConfigType.CUSTOM)
config.remarks = System.currentTimeMillis().toString()
config.subscriptionId = subscriptionId config.subscriptionId = subscriptionId
config.fullConfig = Gson().fromJson(server, V2rayConfig::class.java) config.fullConfig = Gson().fromJson(server, V2rayConfig::class.java)
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)
serverList.add(0, key) serverList.add(0, key)