wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-09-24 17:37:30 +09:00
Code Issues Projects Releases Packages Wiki Activity

Bug 1271353 - check own email addresses case-insensitively in correspondents column and ignore plus addressing part.

Browse source 
Tag #1273
This commit is contained in:
Matt A. Tobin 2019-11-10 22:56:15 -05:00 • committed by Roy Tam
commit 832d721135
1 changed files with 25 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

28
mailnews/base/src/nsMsgDBView.cpp
View file

@ -870,6 +870,24 @@ nsresult nsMsgDBView::FetchLabel(nsIMsgDBHdr *aHdr, nsAString &aLabelString)
return NS_OK; return NS_OK;
} }
/**
* Lowercase the email and remove a possible plus addressing part.
* E.g. John+test@example.com -> john@example.com.
*/
static void
ToLowerCaseDropPlusAddessing(nsCString& aEmail)
{
ToLowerCase(aEmail);
int32_t indPlus;
if ((indPlus = aEmail.FindChar('+')) == kNotFound)
return;
int32_t indAt;
indAt = aEmail.FindChar('@', indPlus);
if (indAt == kNotFound)
return;
aEmail.ReplaceLiteral(indPlus, indAt - indPlus, "");
}
bool nsMsgDBView::IsOutgoingMsg(nsIMsgDBHdr* aHdr) bool nsMsgDBView::IsOutgoingMsg(nsIMsgDBHdr* aHdr)
{ {
nsString author; nsString author;
@ -878,7 +896,7 @@ bool nsMsgDBView::IsOutgoingMsg(nsIMsgDBHdr* aHdr)
nsCString emailAddress; nsCString emailAddress;
nsString name; nsString name;
ExtractFirstAddress(DecodedHeader(author), name, emailAddress); ExtractFirstAddress(DecodedHeader(author), name, emailAddress);
ToLowerCaseDropPlusAddessing(emailAddress);
return mEmails.Contains(emailAddress); return mEmails.Contains(emailAddress);
} }
@ -2340,12 +2358,16 @@ NS_IMETHODIMP nsMsgDBView::Open(nsIMsgFolder *folder, nsMsgViewSortTypeValue sor
nsCString email; nsCString email;
identity->GetEmail(email); identity->GetEmail(email);
if (!email.IsEmpty()) if (!email.IsEmpty()) {
ToLowerCaseDropPlusAddessing(email);
mEmails.PutEntry(email); mEmails.PutEntry(email);
}
identity->GetReplyTo(email); identity->GetReplyTo(email);
if (!email.IsEmpty()) if (!email.IsEmpty()) {
ToLowerCaseDropPlusAddessing(email);
mEmails.PutEntry(email); mEmails.PutEntry(email);
}
} }
return NS_OK; return NS_OK;
} }