From 28027b52881fcfb1aecbddf3fc3f6814e00b9e69 Mon Sep 17 00:00:00 2001 From: Tamim Hossain <132823494+CodeWithTamim@users.noreply.github.com> Date: Fri, 25 Oct 2024 17:13:34 +0600 Subject: [PATCH] Fix Comment and Improve Null Safety in ServerCustomConfigActivity (#3779) Fixed the comment typo in ServerCustomConfigActivity and improved null safety in the bindingServer function by ensuring proper fallback for raw content. Simplified logic for setting editor content. --- .../com/v2ray/ang/ui/ServerCustomConfigActivity.kt | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/ServerCustomConfigActivity.kt b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/ServerCustomConfigActivity.kt index d6891270..22605892 100644 --- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/ServerCustomConfigActivity.kt +++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/ServerCustomConfigActivity.kt @@ -48,16 +48,14 @@ class ServerCustomConfigActivity : BaseActivity() { } /** - * bingding seleced server config + * Binding selected server config */ private fun bindingServer(config: ServerConfig): Boolean { binding.etRemarks.text = Utils.getEditable(config.remarks) val raw = MmkvManager.decodeServerRaw(editGuid) - if (raw.isNullOrBlank()) { - binding.editor.setTextContent(Utils.getEditable(config.fullConfig?.toPrettyPrinting().orEmpty())) - } else { - binding.editor.setTextContent(Utils.getEditable(raw)) - } + val configContent = raw ?: config.fullConfig?.toPrettyPrinting().orEmpty() + + binding.editor.setTextContent(Utils.getEditable(configContent)) return true }