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 @@ - - -