diff --git a/app/src/main/java/com/idormy/sms/forwarder/sender/SenderMailMsg.java b/app/src/main/java/com/idormy/sms/forwarder/sender/SenderMailMsg.java index f58f6086..e3614e78 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/sender/SenderMailMsg.java +++ b/app/src/main/java/com/idormy/sms/forwarder/sender/SenderMailMsg.java @@ -8,6 +8,9 @@ import com.idormy.sms.forwarder.utils.SettingUtil; import com.smailnet.emailkit.Draft; import com.smailnet.emailkit.EmailKit; +import java.util.Arrays; +import java.util.HashSet; +import java.util.Set; import java.util.concurrent.TimeUnit; import io.reactivex.rxjava3.core.Observable; @@ -35,12 +38,15 @@ public class SenderMailMsg extends SenderBaseMsg { .setAccount(fromEmail) //发件人邮箱 .setPassword(pwd); //密码或授权码 + //多个收件人邮箱 + Set toSet = new HashSet<>(Arrays.asList(toAdd.replace(",", ",").split(","))); + //设置一封草稿邮件 Draft draft = new Draft() .setNickname(nickname) //发件人昵称 - .setTo(toAdd) //收件人邮箱 - .setSubject(title) //邮件主题 - .setText(content); //邮件正文 + .setTo(toSet) //收件人邮箱 + .setSubject(title) //邮件主题 + .setText(content); //邮件正文 //使用SMTP服务发送邮件 EmailKit.useSMTPService(config) diff --git a/app/src/main/res/layout/alert_dialog_setview_email.xml b/app/src/main/res/layout/alert_dialog_setview_email.xml index 18e8bf65..c1e1d972 100644 --- a/app/src/main/res/layout/alert_dialog_setview_email.xml +++ b/app/src/main/res/layout/alert_dialog_setview_email.xml @@ -242,27 +242,42 @@ + android:layout_height="wrap_content" + android:layout_marginStart="10dp" + android:layout_marginEnd="10dp" + android:layout_marginTop="5dp" + android:background="@android:color/white" + android:gravity="center_vertical" + android:orientation="vertical"> - + android:orientation="horizontal"> + + + + + + tools:ignore="LabelFor,TextFields" /> Password/Auth Code Nickname Send To + Tip:Separate multiple recipients with a semicolon comma Email Title Webhook Secret (optional) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index ce420643..7af9da5a 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -132,6 +132,7 @@ 登录密码/授权码 发件人昵称 收件地址 + Tip:多个收件人以半角逗号,分隔 邮件主题 Webhook 地址 加签 Secret (没有可不填)