From 490ea594990e4e4e504c97935f052fcdb5fd5007 Mon Sep 17 00:00:00 2001
From: Tamim Hossain <132823494+CodeWithTamim@users.noreply.github.com>
Date: Fri, 25 Oct 2024 17:02:52 +0600
Subject: [PATCH] Refactor saveServer Method to Improve Null-Safety and
 Readability (#3773)

Refactored the saveServer method in RoutingEditActivity to improve null-safety and readability by using apply and takeIf. This ensures cleaner and more concise code while processing user inputs like domain, ip, protocol, and network.
---
 .../com/v2ray/ang/ui/RoutingEditActivity.kt   | 24 ++++++++++++-------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/RoutingEditActivity.kt b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/RoutingEditActivity.kt
index f8a64e17..22986f3e 100644
--- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/RoutingEditActivity.kt
+++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/RoutingEditActivity.kt
@@ -59,16 +59,21 @@ class RoutingEditActivity : BaseActivity() {
     private fun saveServer(): Boolean {
         val rulesetItem = SettingsManager.getRoutingRuleset(position) ?: RulesetItem()
 
-        rulesetItem.remarks = binding.etRemarks.text.toString()
-        rulesetItem.looked = binding.chkLocked.isChecked
-        binding.etDomain.text.toString().let { rulesetItem.domain = if (it.isEmpty()) null else it.split(",").map { itt -> itt.trim() }.filter { itt -> itt.isNotEmpty() } }
-        binding.etIp.text.toString().let { rulesetItem.ip = if (it.isEmpty()) null else it.split(",").map { itt -> itt.trim() }.filter { itt -> itt.isNotEmpty() } }
-        binding.etProtocol.text.toString().let { rulesetItem.protocol = if (it.isEmpty()) null else it.split(",").map { itt -> itt.trim() }.filter { itt -> itt.isNotEmpty() } }
-        binding.etPort.text.toString().let { rulesetItem.port = it.ifEmpty { null } }
-        binding.etNetwork.text.toString().let { rulesetItem.network = it.ifEmpty { null } }
-        rulesetItem.outboundTag = outbound_tag[binding.spOutboundTag.selectedItemPosition]
+        rulesetItem.apply {
+            remarks = binding.etRemarks.text.toString()
+            looked = binding.chkLocked.isChecked
+            domain = binding.etDomain.text.toString().takeIf { it.isNotEmpty() }
+                ?.split(",")?.map { it.trim() }?.filter { it.isNotEmpty() }
+            ip = binding.etIp.text.toString().takeIf { it.isNotEmpty() }
+                ?.split(",")?.map { it.trim() }?.filter { it.isNotEmpty() }
+            protocol = binding.etProtocol.text.toString().takeIf { it.isNotEmpty() }
+                ?.split(",")?.map { it.trim() }?.filter { it.isNotEmpty() }
+            port = binding.etPort.text.toString().takeIf { it.isNotEmpty() }
+            network = binding.etNetwork.text.toString().takeIf { it.isNotEmpty() }
+            outboundTag = outbound_tag[binding.spOutboundTag.selectedItemPosition]
+        }
 
-        if (TextUtils.isEmpty(rulesetItem.remarks)) {
+        if (rulesetItem.remarks.isNullOrEmpty()) {
             toast(R.string.sub_setting_remarks)
             return false
         }
@@ -79,6 +84,7 @@ class RoutingEditActivity : BaseActivity() {
         return true
     }
 
+
     private fun deleteServer(): Boolean {
         if (position >= 0) {
             AlertDialog.Builder(this).setMessage(R.string.del_config_comfirm)