From 27e3340c32e7e59349b9d970a089d388ae5d2c4a Mon Sep 17 00:00:00 2001
From: pppscn <35696959@qq.com>
Date: Fri, 24 Jun 2022 09:57:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9A=E5=8F=91=E9=80=81?=
 =?UTF-8?q?=E9=80=9A=E9=81=93`webhook`=E7=9A=84`webParams`=E9=9D=9E?=
 =?UTF-8?q?=E7=A9=BA=E6=97=B6=EF=BC=88wiki:2.1/2.2=EF=BC=89=E4=B8=8D?=
 =?UTF-8?q?=E5=86=8D=E9=99=90=E5=88=B6=E5=BF=85=E9=A1=BB=E5=8C=85=E5=90=AB?=
 =?UTF-8?q?`[msg]`=E6=A0=87=E7=AD=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/idormy/sms/forwarder/utils/sender/WebhookUtils.kt     | 4 ++--
 1 file changed, 2 insertions(+), 2 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 9c2b8ac3..41b117d4 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
@@ -72,7 +72,7 @@ class WebhookUtils {
                 }
                 Log.d(TAG, "method = GET, Url = $webServer")
                 requestBuilder = Request.Builder().url(webServer).get()
-            } else if (setting.method == "GET" && !TextUtils.isEmpty(setting.webParams)) {
+            } else if (setting.method == "GET" && !TextUtils.isEmpty(webParams)) {
                 webParams = webParams.toString().replace("[from]", URLEncoder.encode(from, "UTF-8"))
                     .replace("[content]", URLEncoder.encode(content, "UTF-8"))
                     .replace("[msg]", URLEncoder.encode(content, "UTF-8"))
@@ -90,7 +90,7 @@ class WebhookUtils {
                 webServer += (if (webServer.contains("?")) "&" else "?") + webParams
                 Log.d(TAG, "method = GET, Url = $webServer")
                 requestBuilder = Request.Builder().url(webServer).get()
-            } else if (webParams != null && webParams.contains("[msg]")) {
+            } else if (webParams != null && !TextUtils.isEmpty(webParams)) {
                 val bodyMsg: String
                 var contentType = "application/x-www-form-urlencoded"
                 if (webParams.startsWith("{")) {