diff --git a/app/src/main/java/com/idormy/sms/forwarder/SettingActivity.java b/app/src/main/java/com/idormy/sms/forwarder/SettingActivity.java index 4da5d17e..3a58691f 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/SettingActivity.java +++ b/app/src/main/java/com/idormy/sms/forwarder/SettingActivity.java @@ -186,6 +186,7 @@ public class SettingActivity extends AppCompatActivity { return; case R.id.bt_insert_time: textSmsTemplate.append("{{接收时间}}"); + return; case R.id.bt_insert_device_name: textSmsTemplate.append("{{设备名称}}"); return; diff --git a/app/src/main/java/com/idormy/sms/forwarder/sender/SenderTelegramMsg.java b/app/src/main/java/com/idormy/sms/forwarder/sender/SenderTelegramMsg.java index 61c8483b..b359f803 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/sender/SenderTelegramMsg.java +++ b/app/src/main/java/com/idormy/sms/forwarder/sender/SenderTelegramMsg.java @@ -34,14 +34,14 @@ public class SenderTelegramMsg { } //特殊处理避免标题重复 - text = text.replaceFirst("^" + from + "(.*)", "").trim(); + text = text.replaceFirst("^" + from + "(.*)", "").replaceAll("#", "井").trim(); String sendUrl = "https://api.telegram.org/bot" + apiToken + "/sendMessage"; Log.d(TAG, "sendUrl:" + sendUrl); Map bodyMap = new HashMap(); bodyMap.put("chat_id", chatId); - bodyMap.put("text", text.trim()); + bodyMap.put("text", text); bodyMap.put("parse_mode", "HTML"); String bodyMsg = JSON.toJSONString(bodyMap); Log.d(TAG, "body:" + bodyMsg);