From 2bebb44fb8788bea3e2f5e0a51a491d5fd2f721f Mon Sep 17 00:00:00 2001
From: pppscn <35696959@qq.com>
Date: Tue, 10 Oct 2023 16:38:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9A=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E4=BC=81=E4=B8=9A=E4=B8=93=E6=9C=89=E9=92=89=E9=92=89=E7=9A=84?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=20#348=20=EF=BC=88=E5=A1=AB=E5=86=99`Webhook?=
 =?UTF-8?q?`=E5=85=A8=E5=9C=B0=E5=9D=80=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fragment/senders/DingtalkGroupRobotFragment.kt |  2 +-
 app/src/main/res/values-en/strings.xml             | 14 +++++++-------
 app/src/main/res/values/strings.xml                |  6 +++---
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/com/idormy/sms/forwarder/fragment/senders/DingtalkGroupRobotFragment.kt b/app/src/main/java/com/idormy/sms/forwarder/fragment/senders/DingtalkGroupRobotFragment.kt
index 57c583d1..2ea1e6f0 100644
--- a/app/src/main/java/com/idormy/sms/forwarder/fragment/senders/DingtalkGroupRobotFragment.kt
+++ b/app/src/main/java/com/idormy/sms/forwarder/fragment/senders/DingtalkGroupRobotFragment.kt
@@ -248,7 +248,7 @@ class DingtalkGroupRobotFragment : BaseFragment<FragmentSendersDingtalkGroupRobo
 
     private fun checkSetting(): DingtalkGroupRobotSetting {
         val token = binding!!.etToken.text.toString().trim()
-        if (CommonUtils.checkUrl(token, true)) {
+        if (TextUtils.isEmpty(token)) {
             throw Exception(getString(R.string.invalid_token))
         }
 
diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml
index 2d55334c..7923a12a 100644
--- a/app/src/main/res/values-en/strings.xml
+++ b/app/src/main/res/values-en/strings.xml
@@ -708,9 +708,9 @@
     <string name="sender_name_status">Channel Name/Status</string>
     <string name="choose_sender_status">Send Channel/Status</string>
 
-    <string name="dingtalk_token">Token (without link)</string>
-    <string name="dingtalk_token_tips">Example: XXX in https://oapi.dingtalk.com/robot/send?access_token=XXX</string>
-    <string name="dingtalk_token_hint">Robot Settings→webhook→access_token</string>
+    <string name="dingtalk_token">Webhook</string>
+    <string name="dingtalk_token_tips">e.g. https://oapi.dingtalk.com/robot/send?access_token=XXX</string>
+    <string name="dingtalk_token_hint">Robot Settings→webhook</string>
     <string name="dingtalk_secret">Secret</string>
     <string name="dingtalk_secret_hint">Robot Settings→Security Settings→Sign Up</string>
     <string name="dingtalk_at_mobiles">At Mobiles</string>
@@ -719,17 +719,17 @@
     <string name="dingtalk_at_dingtalkids_tip">Tips：Separate multiple DingtalkIds with commas, e.g. user1,user2</string>
 
     <string name="bark_server">Bark-Server</string>
-    <string name="bark_server_tips">Example: https://api.day.app/XXXXXXXX/</string>
+    <string name="bark_server_tips">e.g. https://api.day.app/XXXXXXXX/</string>
     <string name="bark_server_regex">^https?://[^/]+/[^/]+/$</string>
     <string name="bark_server_error">The Url format is wrong, e.g. https://api.day.app/XXXXXXXX/</string>
     <string name="bark_group">Group Name</string>
-    <string name="bark_group_tips">Optional, eg: SmsForwarder</string>
+    <string name="bark_group_tips">Optional, e.g. SmsForwarder</string>
     <string name="bark_icon">Message Icon</string>
     <string name="bark_icon_tips">Optional, fill in Url, the picture should not be too big</string>
     <string name="bark_sound">Message Sound</string>
     <string name="bark_sound_tips">Optional, e.g. minuet.caf</string>
     <string name="bark_badge">Message Badge</string>
-    <string name="bark_badge_tips">Optional, eg: 888</string>
+    <string name="bark_badge_tips">Optional, e.g. 888</string>
     <string name="bark_url">Message Link</string>
     <string name="bark_url_tips">Optional, e.g. https://github.com/pppscn/SmsForwarder</string>
     <string name="bark_level">Notification Level</string>
@@ -758,7 +758,7 @@
     <string name="mail_pwd_hint">Fill in the login password or authorization code</string>
 
     <string name="wework_webHook">WebHook</string>
-    <string name="wework_webHook_tips">Example: https://qyapi.weixin.qq.com/cgixx?key=xxx</string>
+    <string name="wework_webHook_tips">e.g. https://qyapi.weixin.qq.com/cgixx?key=xxx</string>
     <string name="wework_msg_type">Msg Type</string>
     <string name="wework_msg_type_text">Text</string>
     <string name="wework_msg_type_markdown">Markdown</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 562bad92..1fb78ab0 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -709,9 +709,9 @@
     <string name="sender_name_status">通道名称/状态</string>
     <string name="choose_sender_status">发送通道/状态</string>
 
-    <string name="dingtalk_token">Token（不含链接）</string>
-    <string name="dingtalk_token_tips">例：https://oapi.dingtalk.com/robot/send?access_token=XXX 中的 XXX</string>
-    <string name="dingtalk_token_hint">机器人设置→webhook→access_token</string>
+    <string name="dingtalk_token">Webhook</string>
+    <string name="dingtalk_token_tips">例：https://oapi.dingtalk.com/robot/send?access_token=XXX</string>
+    <string name="dingtalk_token_hint">机器人设置→webhook</string>
     <string name="dingtalk_secret">加签 Secret</string>
     <string name="dingtalk_secret_hint">机器人设置→安全设置→加签</string>
     <string name="dingtalk_at_mobiles">被@人的手机号</string>