From f7d2544ee9eb63a150e072779173c34d44494fc3 Mon Sep 17 00:00:00 2001
From: pppscn <35696959@qq.com>
Date: Thu, 23 May 2024 15:38:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9A`webhook`=E9=80=9A?=
 =?UTF-8?q?=E9=81=93`webParam`=E5=88=86=E5=89=B2=E9=94=AE=E5=80=BC?=
 =?UTF-8?q?=E5=AF=B9=E6=96=B9=E5=BC=8F=20#472?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../forwarder/utils/sender/WebhookUtils.kt    | 35 ++++++++++---------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/app/src/main/java/com/idormy/sms/forwarder/utils/sender/WebhookUtils.kt b/app/src/main/java/com/idormy/sms/forwarder/utils/sender/WebhookUtils.kt
index c65f643f..2e8030b7 100644
--- a/app/src/main/java/com/idormy/sms/forwarder/utils/sender/WebhookUtils.kt
+++ b/app/src/main/java/com/idormy/sms/forwarder/utils/sender/WebhookUtils.kt
@@ -161,23 +161,24 @@ class WebhookUtils {
                     else -> XHttp.post(requestUrl).keepJson(true)
                 }
                 webParams.trim('&').split("&").forEach {
-                    val param = it.split("=")
-                    if (param.size == 2) {
-                        postRequest.params(
-                            param[0], param[1].replace("[from]", from)
-                                .replace("[content]", content)
-                                .replace("[msg]", content)
-                                .replace("[org_content]", orgContent)
-                                .replace("[device_mark]", deviceMark)
-                                .replace("[app_version]", appVersion)
-                                .replace("[title]", simInfo)
-                                .replace("[card_slot]", simInfo)
-                                .replace(receiveTimeTag) { t ->
-                                    val format = t.groups[2]?.value
-                                    formatDateTime(msgInfo.date, format)
-                                }
-                                .replace("[timestamp]", timestamp.toString())
-                                .replace("[sign]", sign)
+                    val sepIndex = it.indexOf("=")
+                    if (sepIndex != -1) {
+                        val key = it.substring(0, sepIndex).trim()
+                        val value = it.substring(sepIndex + 1).trim()
+                        postRequest.params(key, value.replace("[from]", from)
+                            .replace("[content]", content)
+                            .replace("[msg]", content)
+                            .replace("[org_content]", orgContent)
+                            .replace("[device_mark]", deviceMark)
+                            .replace("[app_version]", appVersion)
+                            .replace("[title]", simInfo)
+                            .replace("[card_slot]", simInfo)
+                            .replace(receiveTimeTag) { t ->
+                                val format = t.groups[2]?.value
+                                formatDateTime(msgInfo.date, format)
+                            }
+                            .replace("[timestamp]", timestamp.toString())
+                            .replace("[sign]", sign)
                         )
                     }
                 }