From c0329f51b03ad9f6ce4b2bf6fae1bb4f7bedcc79 Mon Sep 17 00:00:00 2001
From: pppscn <35696959@qq.com>
Date: Thu, 11 Jan 2024 23:28:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E6=8F=90=E7=A4=BA?=
 =?UTF-8?q?=E8=BF=9E=E4=B8=8D=E4=B8=8A`smtp.gmail.com`=E7=9A=84`587`?=
 =?UTF-8?q?=E7=AB=AF=E5=8F=A3=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../idormy/sms/forwarder/utils/sender/EmailUtils.kt  |  6 +++---
 app/src/main/res/layout/fragment_senders_webhook.xml | 12 +++++++-----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/com/idormy/sms/forwarder/utils/sender/EmailUtils.kt b/app/src/main/java/com/idormy/sms/forwarder/utils/sender/EmailUtils.kt
index 4893ebe3..36087b05 100644
--- a/app/src/main/java/com/idormy/sms/forwarder/utils/sender/EmailUtils.kt
+++ b/app/src/main/java/com/idormy/sms/forwarder/utils/sender/EmailUtils.kt
@@ -1,10 +1,10 @@
 package com.idormy.sms.forwarder.utils.sender
 
-import com.idormy.sms.forwarder.utils.Log
 import com.idormy.sms.forwarder.R
 import com.idormy.sms.forwarder.database.entity.Rule
 import com.idormy.sms.forwarder.entity.MsgInfo
 import com.idormy.sms.forwarder.entity.setting.EmailSetting
+import com.idormy.sms.forwarder.utils.Log
 import com.idormy.sms.forwarder.utils.SendUtils
 import com.idormy.sms.forwarder.utils.SettingUtils
 import com.idormy.sms.forwarder.utils.mail.Mail
@@ -69,9 +69,9 @@ class EmailUtils {
 
                 "@gmail.com" -> {
                     setting.host = "smtp.gmail.com"
-                    setting.port = "587"
+                    setting.port = "465"
                     setting.ssl = true
-                    setting.startTls = true
+                    //setting.startTls = true
                     setting.fromEmail += setting.mailType
                 }
 
diff --git a/app/src/main/res/layout/fragment_senders_webhook.xml b/app/src/main/res/layout/fragment_senders_webhook.xml
index 3a5cd6cf..392a45ce 100644
--- a/app/src/main/res/layout/fragment_senders_webhook.xml
+++ b/app/src/main/res/layout/fragment_senders_webhook.xml
@@ -155,15 +155,17 @@
                     android:textSize="@dimen/text_size_mini"
                     tools:ignore="SmallSp" />
 
-                <com.xuexiang.xui.widget.edittext.materialedittext.MaterialEditText
+                <com.xuexiang.xui.widget.edittext.ClearEditText
                     android:id="@+id/et_webParams"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:autofillHints=""
+                    android:gravity="left|top"
                     android:hint="@string/optional"
-                    android:inputType="textUri"
-                    android:singleLine="true"
-                    app:met_clearButton="true"
-                    tools:ignore="DuplicateSpeakableTextCheck,TextContrastCheck,TouchTargetSizeCheck" />
+                    android:inputType="textMultiLine"
+                    android:minLines="3"
+                    android:text=""
+                    tools:ignore="RtlHardcoded,SpeakableTextPresentCheck" />
 
             </LinearLayout>