react-native-email-imap-smtp 0.3.34 → 0.3.35

package/android/src/main/java/com/margelo/nitro/emailimapsmtp/EmailImapSmtp.kt

@@ -252,7 +252,7 @@ class EmailImapSmtp : HybridEmailImapSmtpSpec() {
 
   // ─── 邮件解析 ─────────────────────────────────────────────
 
-  private fun emailToEmailMessage(msg: Message, folder: IMAPFolder): EmailMessage {
+  private fun emailToEmailMessage(msg: Message, folder: IMAPFolder, needBody: Boolean = true): EmailMessage {
     val mime = msg as? MimeMessage ?: return EmailMessage(
       uid = 0.0, sequenceNumber = msg.messageNumber.toDouble(),
       subject = "", from = EmailAddress("", ""), to = emptyArray(),
@@ -286,9 +286,10 @@ class EmailImapSmtp : HybridEmailImapSmtpSpec() {
         onHtml = { bodyHtml = it },
         onEmbedded = { embeddedAttachments.add(it) },
         onAttachment = { attachments.add(it) },
-        fullData = false)
+        fullData = false,
+        needBody = needBody)
     } catch (_: Exception) {
-      bodyText = mime.content?.toString() ?: ""
+      if (needBody) bodyText = mime.content?.toString() ?: ""
     }
 
     val headers = mutableMapOf<String, String>()
@@ -392,19 +393,20 @@ class EmailImapSmtp : HybridEmailImapSmtpSpec() {
     onEmbedded: (String) -> Unit,
     onAttachment: (AttachmentInfo) -> Unit,
     fullData: Boolean = true,
+    needBody: Boolean = true,
   ) {
     if (part.isMimeType("text/plain")) {
       // text/plain 也可能是附件（带 attachment disposition / filename / name）：
       // 先判定附件，再当作正文。与 Web 端一致（1.txt/2.txt 等 text/plain 附件）。
       if (isAttachmentLike(part)) {
         handleAttachmentLeaf(part, onEmbedded, onAttachment, fullData)
-      } else {
+      } else if (needBody) {
         onText(part.content?.toString() ?: "")
       }
     } else if (part.isMimeType("text/html")) {
       if (isAttachmentLike(part)) {
         handleAttachmentLeaf(part, onEmbedded, onAttachment, fullData)
-      } else {
+      } else if (needBody) {
         onHtml(part.content?.toString() ?: "")
       }
     } else if (part.isMimeType("multipart/alternative")) {
@@ -414,12 +416,14 @@ class EmailImapSmtp : HybridEmailImapSmtpSpec() {
       for (i in 0 until mp.count) {
         val bp = mp.getBodyPart(i)
         if (bp.isMimeType("text/html") && !foundHtml && !isAttachmentLike(bp)) {
-          onHtml(bp.content?.toString() ?: ""); foundHtml = true
+          foundHtml = true
+          if (needBody) onHtml(bp.content?.toString() ?: "")
         } else if (bp.isMimeType("text/plain") && !foundText && !isAttachmentLike(bp)) {
-          onText(bp.content?.toString() ?: ""); foundText = true
+          foundText = true
+          if (needBody) onText(bp.content?.toString() ?: "")
         } else if (bp.isMimeType("multipart/*")) {
           // alternative 内嵌套的子 multipart（related/mixed 等）→ 递归，不遗漏附件
-          parseBodyParts(bp, onText, onHtml, onEmbedded, onAttachment, fullData)
+          parseBodyParts(bp, onText, onHtml, onEmbedded, onAttachment, fullData, needBody)
         } else {
           // alternative 内的非正文叶子（内嵌图/附件）→ 附件判定
           handleAttachmentLeaf(bp, onEmbedded, onAttachment, fullData)
@@ -428,7 +432,7 @@ class EmailImapSmtp : HybridEmailImapSmtpSpec() {
     } else if (part.isMimeType("multipart/*")) {
       val mp = part.content as? Multipart ?: return
       for (i in 0 until mp.count) {
-        parseBodyParts(mp.getBodyPart(i), onText, onHtml, onEmbedded, onAttachment, fullData)
+        parseBodyParts(mp.getBodyPart(i), onText, onHtml, onEmbedded, onAttachment, fullData, needBody)
       }
     } else {
       handleAttachmentLeaf(part, onEmbedded, onAttachment, fullData)
@@ -914,7 +918,8 @@ class EmailImapSmtp : HybridEmailImapSmtpSpec() {
       }
 
       try {
-        msgs.forEach { result.add(emailToEmailMessage(it, ensureFolderOpen())) }
+        val needBody = options.fetchBody != false
+        msgs.forEach { result.add(emailToEmailMessage(it, ensureFolderOpen(), needBody)) }
       } catch (e: Exception) {
         Log.e(TAG, "Fetch emails failed", e)
       }
@@ -975,7 +980,7 @@ class EmailImapSmtp : HybridEmailImapSmtpSpec() {
           }
           val limit = minOf(criteria.limit?.toInt() ?: msgs.size, msgs.size, MAX_FETCH_COUNT)
           val sorted = msgs.sortedByDescending { it.receivedDate?.time ?: 0L }.take(limit)
-          sorted.forEach { result.add(emailToEmailMessage(it, folder)) }
+          sorted.forEach { result.add(emailToEmailMessage(it, folder, criteria.fetchBody != false)) }
           return@async result.toTypedArray()
         }
 
@@ -1039,7 +1044,7 @@ class EmailImapSmtp : HybridEmailImapSmtpSpec() {
 
         val limit = minOf(criteria.limit?.toInt() ?: sortedMsgs.size, sortedMsgs.size, MAX_FETCH_COUNT)
         for (i in 0 until limit) {
-          result.add(emailToEmailMessage(sortedMsgs[i], folder))
+          result.add(emailToEmailMessage(sortedMsgs[i], folder, criteria.fetchBody != false))
         }
         }
       } catch (e: Exception) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-email-imap-smtp",
-  "version": "0.3.34",
+  "version": "0.3.35",
   "description": "The best of imap and smtp client of react native",
   "main": "./lib/module/index.js",
   "types": "./lib/typescript/src/index.d.ts",