From 1eda4a182e09f1755ff996178a6d4dcc39bbafd6 Mon Sep 17 00:00:00 2001
From: pppscn <35696959@qq.com>
Date: Tue, 11 Jan 2022 21:14:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9A=E9=82=AE=E4=BB=B6?=
 =?UTF-8?q?=E5=8F=91=E9=80=81=E6=94=AF=E6=8C=81=E5=A4=9A=E4=B8=AA=E6=94=B6?=
 =?UTF-8?q?=E4=BB=B6=E4=BA=BA=EF=BC=88=E4=BB=A5=E5=8D=8A=E8=A7=92=E9=80=97?=
 =?UTF-8?q?=E5=8F=B7,=E5=88=86=E9=9A=94=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sms/forwarder/sender/SenderMailMsg.java   | 12 ++++--
 .../res/layout/alert_dialog_setview_email.xml | 41 +++++++++++++------
 app/src/main/res/values-en/strings.xml        |  1 +
 app/src/main/res/values/strings.xml           |  1 +
 4 files changed, 39 insertions(+), 16 deletions(-)

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<String> 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 @@
 
         <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_marginLeft="10dp"
-            android:layout_marginRight="10dp"
-            android:orientation="horizontal">
+            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">
 
-            <TextView
-                android:layout_width="wrap_content"
+            <LinearLayout
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="@string/email_to" />
+                android:orientation="horizontal">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/email_to" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="5dp"
+                    android:text="@string/email_to_tips"
+                    android:textSize="11sp" />
+            </LinearLayout>
 
             <EditText
                 android:id="@+id/editTextEmailToAdd"
-                android:layout_width="wrap_content"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="3dp"
                 android:autofillHints=""
-                android:ems="14"
-                android:inputType="textEmailAddress"
-                android:maxLines="1"
+                android:inputType="text"
+                android:gravity="start|top"
+                android:minLines="1"
                 android:text=""
-                tools:ignore="LabelFor" />
+                tools:ignore="LabelFor,TextFields" />
         </LinearLayout>
 
         <LinearLayout
diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml
index f0bff7f7..388d3452 100644
--- a/app/src/main/res/values-en/strings.xml
+++ b/app/src/main/res/values-en/strings.xml
@@ -132,6 +132,7 @@
     <string name="email_password">Password/Auth Code</string>
     <string name="email_nickname">Nickname</string>
     <string name="email_to">Send To</string>
+    <string name="email_to_tips">Tip：Separate multiple recipients with a semicolon comma</string>
     <string name="email_title">Email Title</string>
     <string name="feishu_webhook">Webhook</string>
     <string name="feishu_secret">Secret (optional)</string>
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 @@
     <string name="email_password">登录密码/授权码</string>
     <string name="email_nickname">发件人昵称</string>
     <string name="email_to">收件地址</string>
+    <string name="email_to_tips">Tip：多个收件人以半角逗号,分隔</string>
     <string name="email_title">邮件主题</string>
     <string name="feishu_webhook">Webhook 地址</string>
     <string name="feishu_secret">加签 Secret (没有可不填)</string>