littlebalalafairy/SmsForwarder
1
0
Fork 0
mirror of https://github.com/pppscn/SmsForwarder synced 2025-08-04 01:47:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

修复：发件人昵称插入 {{接收时间}} 时转码失败（Nested Group）

Browse Source 
优化：邮件主题、发件人昵称替换冒号、换行为 -
This commit is contained in:
pppscn 2022-06-15 14:57:23 +08:00
parent 4a81c0d0a5
commit f621237c15
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/com/idormy/sms/forwarder/utils/PhoneUtils.kt
View File

@ -216,7 +216,7 @@ class PhoneUtils private constructor() {
val indexDuration = cursor.getColumnIndex(CallLog.Calls.DURATION) val indexDuration = cursor.getColumnIndex(CallLog.Calls.DURATION)
val indexType = cursor.getColumnIndex(CallLog.Calls.TYPE) 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 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 var indexSimId = -1
if (cursor.getColumnIndex("simid") != -1) { if (cursor.getColumnIndex("simid") != -1) {
indexSimId = cursor.getColumnIndex("simid") indexSimId = cursor.getColumnIndex("simid")
@ -396,7 +396,7 @@ class PhoneUtils private constructor() {
val indexBody = cursor.getColumnIndex("body") val indexBody = cursor.getColumnIndex("body")
val indexDate = cursor.getColumnIndex("date") val indexDate = cursor.getColumnIndex("date")
val indexType = cursor.getColumnIndex("type") val indexType = cursor.getColumnIndex("type")
var isSimId = false val isSimId = false
var indexSimId = -1 var indexSimId = -1
if (cursor.getColumnIndex("sim_id") != -1) { if (cursor.getColumnIndex("sim_id") != -1) {
indexSimId = cursor.getColumnIndex("sim_id") indexSimId = cursor.getColumnIndex("sim_id")

15
app/src/main/java/com/idormy/sms/forwarder/utils/mail/MailUtil.kt
View File

@ -50,11 +50,15 @@ object MailUtil {
if (TextUtils.isEmpty(mail.fromNickname)) { if (TextUtils.isEmpty(mail.fromNickname)) {
setFrom(InternetAddress(mail.fromAddress)) setFrom(InternetAddress(mail.fromAddress))
} else { } else {
val nickname = try { var nickname = mail.fromNickname.replace(":", "-").replace("\n", "-")
MimeUtility.encodeText(mail.fromNickname) try {
Log.d("createMailMessage", "nickname = $nickname")
nickname = MimeUtility.encodeText(nickname)
} catch (e: UnsupportedEncodingException) { } catch (e: UnsupportedEncodingException) {
e.printStackTrace() e.printStackTrace()
} }
Log.d("createMailMessage", "nickname = $nickname")
setFrom(InternetAddress("$nickname <${mail.fromAddress}>")) setFrom(InternetAddress("$nickname <${mail.fromAddress}>"))
} }
@ -77,7 +81,12 @@ object MailUtil {
setRecipients(Message.RecipientType.BCC, bccAddress) 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() val contentPart = MimeMultipart()