From a5a1a62873001de1b0792e645b17238ab003e74d Mon Sep 17 00:00:00 2001
From: pppscn <35696959@qq.com>
Date: Wed, 22 Jun 2022 13:10:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9Awebhook=E9=80=9A?=
 =?UTF-8?q?=E9=81=93=E6=9B=BF=E6=8D=A2POST=E6=97=B6=E6=9B=BF=E6=8D=A2webPa?=
 =?UTF-8?q?rams=E4=B8=AD[timestamp]/[sign]=E6=A0=87=E7=AD=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/java/com/idormy/sms/forwarder/App.kt             | 2 +-
 .../com/idormy/sms/forwarder/utils/sender/WebhookUtils.kt     | 4 ++++
 app/src/main/res/values-en/strings.xml                        | 2 +-
 app/src/main/res/values/strings.xml                           | 2 +-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/idormy/sms/forwarder/App.kt b/app/src/main/java/com/idormy/sms/forwarder/App.kt
index 1a3b68ec..d27eff28 100644
--- a/app/src/main/java/com/idormy/sms/forwarder/App.kt
+++ b/app/src/main/java/com/idormy/sms/forwarder/App.kt
@@ -107,7 +107,7 @@ class App : Application(), CactusCallback, Configuration.Provider by Core {
             try {
                 TinkerLoadLibrary.installNativeLibraryPath(classLoader, soFile)
             } catch (throwable: Throwable) {
-                Log.e("APP", throwable.message!!)
+                Log.e("APP", throwable.message.toString())
             }
 
             //启动前台服务
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 b42b70e9..9c2b8ac3 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
@@ -104,6 +104,8 @@ class WebhookUtils {
                         .replace("[title]", escapeJson(simInfo))
                         .replace("[card_slot]", escapeJson(simInfo))
                         .replace("[receive_time]", receiveTime)
+                        .replace("[timestamp]", timestamp.toString())
+                        .replace("[sign]", sign)
                 } else {
                     bodyMsg = webParams.replace("[from]", URLEncoder.encode(from, "UTF-8"))
                         .replace("[content]", URLEncoder.encode(content, "UTF-8"))
@@ -114,6 +116,8 @@ class WebhookUtils {
                         .replace("[title]", URLEncoder.encode(simInfo, "UTF-8"))
                         .replace("[card_slot]", URLEncoder.encode(simInfo, "UTF-8"))
                         .replace("[receive_time]", URLEncoder.encode(receiveTime, "UTF-8"))
+                        .replace("[timestamp]", URLEncoder.encode(timestamp.toString(), "UTF-8"))
+                        .replace("[sign]", URLEncoder.encode(sign, "UTF-8"))
                 }
                 val body = RequestBody.create(MediaType.parse(contentType), bodyMsg)
                 requestBuilder = Request.Builder()
diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml
index e00a3008..4a93028f 100644
--- a/app/src/main/res/values-en/strings.xml
+++ b/app/src/main/res/values-en/strings.xml
@@ -685,7 +685,7 @@
     <string name="webhook_server">Webhook Server</string>
     <string name="webhook_server_tips">For example: https://a.b.com/msg?token=xyz</string>
     <string name="webhook_params">Params</string>
-    <string name="webhook_params_tips">For example: payload=%7B%22text%22%3A%22[msg]%22%7D [msg] will be replaced with SMS content.\nJson format is supported, for example: {text:[msg]}.\nNote: msg is automatically UTF-8 encoded except in JSON format</string>
+    <string name="webhook_params_tips">For example: payload=%7B%22text%22%3A%22[msg]%22%7D [msg] will be replaced with SMS content.\nJson format is supported, for example: {\"text\":\"[msg]\"}.\nNote: msg is automatically UTF-8 encoded except in JSON format</string>
     <string name="webhook_secret">Secret: If it is empty, the sign will not be calculated</string>
     <string name="headers">Headers</string>
     <string name="header_key">Key</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b381fe3c..4687d032 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -686,7 +686,7 @@
     <string name="webhook_server">Webhook Server</string>
     <string name="webhook_server_tips">例如：https://a.b.com/msg?token=xyz</string>
     <string name="webhook_params">Params</string>
-    <string name="webhook_params_tips">例如：payload=%7B%22text%22%3A%22[msg]%22%7D [msg]将被替换成短信内容。\n支持Json格式，例如：{"text":[msg]}。\n注意：除JSON格式外，msg会自动进行UTF-8编码</string>
+    <string name="webhook_params_tips">例如：payload=%7B%22text%22%3A%22[msg]%22%7D [msg]将被替换成短信内容。\n支持Json格式，例如：{\"text\":\"[msg]\"}。\n注意：除JSON格式外，msg会自动进行UTF-8编码</string>
     <string name="webhook_secret">Secret：置空则不计算sign</string>
     <string name="headers">Headers</string>
     <string name="header_key">Key</string>