From f621237c1568ce5133ed267ee842f63fc05d1052 Mon Sep 17 00:00:00 2001 From: pppscn <35696959@qq.com> Date: Wed, 15 Jun 2022 14:57:23 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E5=8F=91=E4=BB=B6?= =?UTF-8?q?=E4=BA=BA=E6=98=B5=E7=A7=B0=E6=8F=92=E5=85=A5=20{{=E6=8E=A5?= =?UTF-8?q?=E6=94=B6=E6=97=B6=E9=97=B4}}=20=E6=97=B6=E8=BD=AC=E7=A0=81?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5=EF=BC=88Nested=20Group=EF=BC=89=20=E4=BC=98?= =?UTF-8?q?=E5=8C=96=EF=BC=9A=E9=82=AE=E4=BB=B6=E4=B8=BB=E9=A2=98=E3=80=81?= =?UTF-8?q?=E5=8F=91=E4=BB=B6=E4=BA=BA=E6=98=B5=E7=A7=B0=E6=9B=BF=E6=8D=A2?= =?UTF-8?q?=E5=86=92=E5=8F=B7=E3=80=81=E6=8D=A2=E8=A1=8C=E4=B8=BA=20-?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/idormy/sms/forwarder/utils/PhoneUtils.kt | 4 ++-- .../idormy/sms/forwarder/utils/mail/MailUtil.kt | 15 ++++++++++++--- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/idormy/sms/forwarder/utils/PhoneUtils.kt b/app/src/main/java/com/idormy/sms/forwarder/utils/PhoneUtils.kt index c4f5dc4a..6d28b443 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/utils/PhoneUtils.kt +++ b/app/src/main/java/com/idormy/sms/forwarder/utils/PhoneUtils.kt @@ -216,7 +216,7 @@ class PhoneUtils private constructor() { val indexDuration = cursor.getColumnIndex(CallLog.Calls.DURATION) val indexType = cursor.getColumnIndex(CallLog.Calls.TYPE) val indexViaNumber = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N && cursor.getColumnIndex("via_number") != -1) cursor.getColumnIndex("via_number") else -1 - var isSimId = false + val isSimId = false var indexSimId = -1 if (cursor.getColumnIndex("simid") != -1) { indexSimId = cursor.getColumnIndex("simid") @@ -396,7 +396,7 @@ class PhoneUtils private constructor() { val indexBody = cursor.getColumnIndex("body") val indexDate = cursor.getColumnIndex("date") val indexType = cursor.getColumnIndex("type") - var isSimId = false + val isSimId = false var indexSimId = -1 if (cursor.getColumnIndex("sim_id") != -1) { indexSimId = cursor.getColumnIndex("sim_id") diff --git a/app/src/main/java/com/idormy/sms/forwarder/utils/mail/MailUtil.kt b/app/src/main/java/com/idormy/sms/forwarder/utils/mail/MailUtil.kt index d16a376b..b966ecc3 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/utils/mail/MailUtil.kt +++ b/app/src/main/java/com/idormy/sms/forwarder/utils/mail/MailUtil.kt @@ -50,11 +50,15 @@ object MailUtil { if (TextUtils.isEmpty(mail.fromNickname)) { setFrom(InternetAddress(mail.fromAddress)) } else { - val nickname = try { - MimeUtility.encodeText(mail.fromNickname) + var nickname = mail.fromNickname.replace(":", "-").replace("\n", "-") + try { + Log.d("createMailMessage", "nickname = $nickname") + nickname = MimeUtility.encodeText(nickname) } catch (e: UnsupportedEncodingException) { e.printStackTrace() } + + Log.d("createMailMessage", "nickname = $nickname") setFrom(InternetAddress("$nickname <${mail.fromAddress}>")) } @@ -77,7 +81,12 @@ object MailUtil { setRecipients(Message.RecipientType.BCC, bccAddress) // 邮件主题 - subject = mail.subject + subject = mail.subject.replace(":", "-").replace("\n", "-") + try { + subject = MimeUtility.encodeText(subject) + } catch (e: UnsupportedEncodingException) { + e.printStackTrace() + } // 邮件内容 val contentPart = MimeMultipart()