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 @@
Webhook Server
For example: https://a.b.com/msg?token=xyz
Params
- 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
+ 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
Secret: If it is empty, the sign will not be calculated
Headers
Key
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 @@
Webhook Server
例如:https://a.b.com/msg?token=xyz
Params
- 例如:payload=%7B%22text%22%3A%22[msg]%22%7D [msg]将被替换成短信内容。\n支持Json格式,例如:{"text":[msg]}。\n注意:除JSON格式外,msg会自动进行UTF-8编码
+ 例如:payload=%7B%22text%22%3A%22[msg]%22%7D [msg]将被替换成短信内容。\n支持Json格式,例如:{\"text\":\"[msg]\"}。\n注意:除JSON格式外,msg会自动进行UTF-8编码
Secret:置空则不计算sign
Headers
Key