Skip to content

Commit 149541e

Browse files
authored
Fixed NPE in MessageExt.| #2998 (#3010)
1 parent 7326750 commit 149541e

File tree

1 file changed

+10
-10
lines changed
  • FlowCrypt/src/main/java/com/flowcrypt/email/extensions/com/google/api/services/gmail/model

1 file changed

+10
-10
lines changed

FlowCrypt/src/main/java/com/flowcrypt/email/extensions/com/google/api/services/gmail/model/MessageExt.kt

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import jakarta.mail.internet.InternetAddress
2121
*/
2222
fun Message.hasPgp(): Boolean {
2323
val baseContentType = payload?.headers?.firstOrNull {
24-
it.name == "Content-Type"
24+
it?.name == "Content-Type"
2525
}?.value?.asContentTypeOrNull()
2626

2727
/**
@@ -51,25 +51,25 @@ fun Message.hasPgp(): Boolean {
5151

5252
fun Message.getRecipients(vararg recipientType: String): List<InternetAddress> {
5353
return payload?.headers?.firstOrNull { header ->
54-
header.name in recipientType
54+
header?.name in recipientType
5555
}?.value?.asInternetAddresses()?.toList() ?: emptyList()
5656
}
5757

5858
fun Message.getSubject(): String? {
5959
return payload?.headers?.firstOrNull { header ->
60-
header.name == "Subject"
60+
header?.name == "Subject"
6161
}?.value
6262
}
6363

6464
fun Message.getInReplyTo(): String? {
6565
return payload?.headers?.firstOrNull { header ->
66-
header.name == JavaEmailConstants.HEADER_IN_REPLY_TO
66+
header?.name == JavaEmailConstants.HEADER_IN_REPLY_TO
6767
}?.value
6868
}
6969

7070
fun Message.getMessageId(): String? {
7171
return payload?.headers?.firstOrNull { header ->
72-
header.name == JavaEmailConstants.HEADER_MESSAGE_ID
72+
header?.name == JavaEmailConstants.HEADER_MESSAGE_ID
7373
}?.value
7474
}
7575

@@ -82,25 +82,25 @@ fun Message.hasAttachments(): Boolean {
8282
}
8383

8484
fun Message.filterHeadersWithName(name: String): List<MessagePartHeader> {
85-
return payload?.headers?.filter { header -> header.name == name } ?: emptyList()
85+
return payload?.headers?.filter { header -> header?.name == name } ?: emptyList()
8686
}
8787

8888
fun Message.containsLabel(localFolder: LocalFolder?): Boolean? {
8989
return labelIds?.contains(localFolder?.fullName)
9090
}
9191

92-
fun Message.isTrashed(): Boolean? {
93-
return labelIds.contains(GmailApiHelper.LABEL_TRASH)
92+
fun Message.isTrashed(): Boolean {
93+
return labelIds?.contains(GmailApiHelper.LABEL_TRASH) == true
9494
}
9595

9696
fun Message.isSent(): Boolean {
97-
return labelIds.contains(GmailApiHelper.LABEL_SENT) == true
97+
return labelIds?.contains(GmailApiHelper.LABEL_SENT) == true
9898
}
9999

100100
fun Message.canBeUsed(localFolder: LocalFolder?): Boolean {
101101
return if (localFolder?.getFolderType() == FoldersManager.FolderType.TRASH) {
102102
isTrashed() == true
103103
} else {
104-
isTrashed()?.not() != false
104+
isTrashed().not() != false
105105
}
106106
}

0 commit comments

Comments
 (0)