Skip to content

Fixed NPE in EmailAndNameWorker #3044

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
ioanmo226 merged 2 commits into from
May 8, 2025
Merged

Fixed NPE in EmailAndNameWorker #3044

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0aad44d
Fixed NPE in EmailAndNameWorker.| #3040
DenBond7 May 8, 2025
43c4b30
Merge branch 'master' into issue_3040_Fix-NPE-in-EmailAndNameWorker
DenBond7 May 8, 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
4 changes: 2 additions & 2 deletions FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/workmanager/EmailAndNameWorker.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ class EmailAndNameWorker(context: Context, params: WorkerParameters) : BaseWorke

for (i in emails.indices) {
val email = emails[i].lowercase()
val name = names[i]
val name = names[i].takeIf { it.isNotEmpty() }
val recipientEntity = recipientDao.getRecipientByEmailSuspend(email)
if (recipientEntity != null) {
if (recipientEntity.name.isNullOrEmpty()) {
Expand All @@ -60,7 +60,7 @@ class EmailAndNameWorker(context: Context, params: WorkerParameters) : BaseWorke
const val EXTRA_KEY_NAMES = BuildConfig.APPLICATION_ID + ".EXTRA_KEY_NAMES"
const val GROUP_UNIQUE_TAG = BuildConfig.APPLICATION_ID + ".UPDATE_EMAIL_AND_NAME"

fun enqueue(context: Context, emailAndNamePairs: List<Pair<String, String?>>) {
fun enqueue(context: Context, emailAndNamePairs: List<Pair<String, String>>) {
var i = 0
val stepValue = 50
while (i < emailAndNamePairs.size) {
Expand Down
10 changes: 4 additions & 6 deletions FlowCrypt/src/main/java/com/flowcrypt/email/util/GeneralUtil.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -597,7 +597,7 @@ class GeneralUtil {
val isSentFolder = imapFolder?.attributes?.contains("\\Sent") != false

if (isSentFolder) {
val emailAndNamePairs = mutableListOf<Pair<String, String?>>()
val emailAndNamePairs = mutableListOf<Pair<String, String>>()
for (message in messages) {
emailAndNamePairs.addAll(getEmailAndNamePairs(message))
}
Expand All @@ -615,9 +615,7 @@ class GeneralUtil {
* This information will be retrieved from "to" and "cc" headers.
*
* @param msg The input [jakarta.mail.Message].
* @return <tt>[List]</tt> of [Pair] objects, which contains information
* about
* emails and names.
* @return <tt>[List]</tt> of [Pair] objects, which contains information about emails and names.
* @throws MessagingException when retrieve information about recipients.
*/
private fun getEmailAndNamePairs(msg: Message): List<Pair<String, String>> {
Expand All @@ -627,15 +625,15 @@ class GeneralUtil {
if (addressesTo != null) {
for (address in addressesTo) {
val internetAddress = address as InternetAddress
pairs.add(Pair(internetAddress.address, internetAddress.personal))
pairs.add(Pair(internetAddress.address, internetAddress.personal ?: ""))
}
}

val addressesCC = msg.getRecipients(Message.RecipientType.CC)
if (addressesCC != null) {
for (address in addressesCC) {
val internetAddress = address as InternetAddress
pairs.add(Pair(internetAddress.address, internetAddress.personal))
pairs.add(Pair(internetAddress.address, internetAddress.personal ?: ""))
}
}

Expand Down