From addb6cc50a0203924844cdfb6872aa603a049b06 Mon Sep 17 00:00:00 2001 From: DenBond7 Date: Mon, 2 Dec 2024 13:46:07 +0200 Subject: [PATCH] Fixed subject issue.| #74 --- .../com/google/api/services/gmail/model/ThreadExt.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/extensions/com/google/api/services/gmail/model/ThreadExt.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/extensions/com/google/api/services/gmail/model/ThreadExt.kt index d1bc15829..a10ef7d29 100644 --- a/FlowCrypt/src/main/java/com/flowcrypt/email/extensions/com/google/api/services/gmail/model/ThreadExt.kt +++ b/FlowCrypt/src/main/java/com/flowcrypt/email/extensions/com/google/api/services/gmail/model/ThreadExt.kt @@ -82,14 +82,14 @@ fun Thread.hasPgp(): Boolean { fun Thread.extractSubject(context: Context, receiverEmail: String): String { return messages?.getOrNull(0)?.takeIf { message -> - message.getRecipients("From").any { internetAddress -> + (message.getRecipients("From").any { internetAddress -> internetAddress.address.equals(receiverEmail, true) - } || (messages?.size ?: 0) == 1 + } || (messages?.size ?: 0) == 1) && !message.isDraft() }?.getSubject() ?: messages.firstOrNull { message -> message.getRecipients("From").any { internetAddress -> internetAddress.address.equals(receiverEmail, true) - } + } && !message.isDraft() }?.getSubject() ?: messages?.getOrNull(0)?.getSubject() ?: context.getString(R.string.no_subject)