Skip to content

Fixed empty recipients issue #2957

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sosnovsky merged 5 commits into from
Feb 20, 2025
Merged

Fixed empty recipients issue #2957

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7ed2b1f
Fixed empty recipients issue.| #2955
DenBond7 Feb 19, 2025
c0d22c8
Merge branch 'master' into issue_2955_fix_recipients
DenBond7 Feb 19, 2025
3a4c7c0
Refactored code
DenBond7 Feb 19, 2025
0e8be18
Refactored code
DenBond7 Feb 19, 2025
e6c1493
Merge branch 'master' into issue_2955_fix_recipients
DenBond7 Feb 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions ...ain/java/com/flowcrypt/email/extensions/com/google/api/services/gmail/model/MessageExt.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import com.flowcrypt.email.api.email.gmail.GmailApiHelper
import com.flowcrypt.email.extensions.kotlin.asContentTypeOrNull
import com.flowcrypt.email.extensions.kotlin.asInternetAddresses
import com.google.api.services.gmail.model.Message
import com.google.api.services.gmail.model.MessagePartHeader
import jakarta.mail.internet.InternetAddress

/**
Expand Down Expand Up @@ -76,4 +77,8 @@ fun Message.isDraft(): Boolean {

fun Message.hasAttachments(): Boolean {
return payload?.hasAttachments() ?: false
}

fun Message.filterHeadersWithName(name: String): List<MessagePartHeader> {
return payload?.headers?.filter { header -> header.name == name } ?: emptyList()
}
41 changes: 27 additions & 14 deletions ...main/java/com/flowcrypt/email/extensions/com/google/api/services/gmail/model/ThreadExt.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,23 +20,36 @@ import jakarta.mail.internet.InternetAddress
*/
fun Thread.getUniqueRecipients(account: String): List<InternetAddress> {
return mutableListOf<InternetAddress>().apply {
val filteredHeaders = messages?.flatMap { message ->
if (message?.payload?.headers?.any {
it.name in listOf(
"From",
"To",
"Cc",
"Delivered-To"
) && it.value.contains(account, true)
} == true) {
message.payload?.headers?.filter { header ->
header.name == "From"
} ?: emptyList()
} else emptyList()
if (messages == null || messages.isEmpty()) {
return@apply
}
val fromHeaderName = "From"

val filteredHeaders = if (messages.size > 1) {
//if we have more than one message in a conversation,
//firstly we will try to filter only active recipients
messages.flatMap { message ->
val listOfAcceptedHeaders = listOf(
fromHeaderName,
"To",
"Cc",
"Delivered-To"
)
if (message.payload?.headers?.any {
it.name in listOfAcceptedHeaders && it.value.contains(account, true)
} == true) {
message.filterHeadersWithName(fromHeaderName)
} else emptyList()
}.ifEmpty {
//otherwise we will use all recipients
messages.flatMap { message -> message.filterHeadersWithName(fromHeaderName) }
}
} else {
messages.first().filterHeadersWithName(fromHeaderName)
}

val mapOfUniqueRecipients = mutableMapOf<String, InternetAddress>()
filteredHeaders?.forEach { header ->
filteredHeaders.forEach { header ->
header.value.asInternetAddresses().forEach { internetAddress ->
val address = internetAddress.address.lowercase()

Expand Down