From 1bd8cb04f8e67808b1c05d387e996b95be7eb29f Mon Sep 17 00:00:00 2001 From: pppscn <35696959@qq.com> Date: Fri, 5 Apr 2024 10:50:08 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9A`=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=C2=B7=E5=BF=AB=E6=8D=B7=E6=8C=87=E4=BB=A4`?= =?UTF-8?q?=20=E2=80=94=E2=80=94=20=E6=89=A7=E8=A1=8C=E5=8A=A8=E4=BD=9C?= =?UTF-8?q?=EF=BC=9A`=E5=8F=91=E9=80=81=E7=9F=AD=E4=BF=A1`=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E6=8F=92=E5=85=A5`=E5=8F=98=E9=87=8F=E6=A0=87?= =?UTF-8?q?=E7=AD=BE`=EF=BC=88=E6=A0=87=E7=AD=BE=E9=80=82=E7=94=A8?= =?UTF-8?q?=E5=9C=BA=E6=99=AF=E5=8F=82=E8=A7=81=20wiki=E9=99=84=E5=BD=953?= =?UTF-8?q?=EF=BC=89=20#441?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/idormy/sms/forwarder/entity/MsgInfo.kt | 2 +- .../com/idormy/sms/forwarder/workers/ActionWorker.kt | 4 +++- app/src/main/res/drawable/ic_delete.xml | 9 --------- 3 files changed, 4 insertions(+), 11 deletions(-) delete mode 100644 app/src/main/res/drawable/ic_delete.xml diff --git a/app/src/main/java/com/idormy/sms/forwarder/entity/MsgInfo.kt b/app/src/main/java/com/idormy/sms/forwarder/entity/MsgInfo.kt index 469f4909..9f9297ff 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/entity/MsgInfo.kt +++ b/app/src/main/java/com/idormy/sms/forwarder/entity/MsgInfo.kt @@ -78,7 +78,7 @@ data class MsgInfo( } @SuppressLint("SimpleDateFormat") - fun replaceTemplate(template: String, regexReplace: String, needJson: Boolean = false): String { + fun replaceTemplate(template: String, regexReplace: String = "", needJson: Boolean = false): String { return template.replaceTag(getString(R.string.tag_from), from, needJson) .replaceTag(getString(R.string.tag_package_name), from, needJson) .replaceTag(getString(R.string.tag_sms), content, needJson) diff --git a/app/src/main/java/com/idormy/sms/forwarder/workers/ActionWorker.kt b/app/src/main/java/com/idormy/sms/forwarder/workers/ActionWorker.kt index 57b38a60..d29951b0 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/workers/ActionWorker.kt +++ b/app/src/main/java/com/idormy/sms/forwarder/workers/ActionWorker.kt @@ -128,7 +128,9 @@ class ActionWorker(context: Context, params: WorkerParameters) : CoroutineWorker val msg = if (ActivityCompat.checkSelfPermission(App.context, Manifest.permission.SEND_SMS) != PackageManager.PERMISSION_GRANTED) { getString(R.string.no_sms_sending_permission) } else { - PhoneUtils.sendSms(mSubscriptionId, smsSetting.phoneNumbers, smsSetting.msgContent) + val mobileList = msgInfo.replaceTemplate(smsSetting.phoneNumbers) + val message = msgInfo.replaceTemplate(smsSetting.msgContent) + PhoneUtils.sendSms(mSubscriptionId, mobileList, message) } if (msg == null || msg == "") { successNum++ diff --git a/app/src/main/res/drawable/ic_delete.xml b/app/src/main/res/drawable/ic_delete.xml deleted file mode 100644 index 4c803eca..00000000 --- a/app/src/main/res/drawable/ic_delete.xml +++ /dev/null @@ -1,9 +0,0 @@ - - -