frodovdr/kopano-ol-extension
1
0
Fork 0
mirror of https://github.com/Kopano-dev/kopano-ol-extension.git synced 2023-10-10 13:37:40 +02:00
Code Issues Releases Wiki Activity

Some additional logging for send-as

Browse Source
This commit is contained in:
Patrick Simpson 2017-12-14 12:23:39 +02:00
parent ba52575105
commit 0bfeac5193
1 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/AcaciaZPushPlugin/AcaciaZPushPlugin/Features/SendAs/FeatureSendAs.cs
View File

@ -93,7 +93,6 @@ namespace Acacia.Features.SendAs
// It's a shared folder, use the owner as the sender if possible // It's a shared folder, use the owner as the sender if possible
using (IRecipient recip = FindSendAsSender(zpush, shared.Store)) using (IRecipient recip = FindSendAsSender(zpush, shared.Store))
{ {
Logger.Instance.Trace(this, "Checking, Shared folder owner recipient: {0}", recip.Name);
if (recip != null && recip.IsResolved) if (recip != null && recip.IsResolved)
{ {
Logger.Instance.Trace(this, "Sending as: {0}", recip.Address); Logger.Instance.Trace(this, "Sending as: {0}", recip.Address);
@ -130,10 +129,16 @@ namespace Acacia.Features.SendAs
{ {
// If it's resolved, we're good. Otherwise dispose and continue // If it's resolved, we're good. Otherwise dispose and continue
if (recip.IsResolved) if (recip.IsResolved)
{
Logger.Instance.Trace(this, "Resolved send-as: {0}", recip.Name);
return recip; return recip;
}
else else
{
Logger.Instance.Trace(this, "Unresolved send-as: {0}", user.UserName);
recip.Dispose(); recip.Dispose();
} }
}
// Search through GAB to find the user // Search through GAB to find the user
if (GABLookup) if (GABLookup)
@ -147,18 +152,30 @@ namespace Acacia.Features.SendAs
search.AddField("urn:schemas:contacts:customerid").SetOperation(SearchOperation.Equal, user.UserName); search.AddField("urn:schemas:contacts:customerid").SetOperation(SearchOperation.Equal, user.UserName);
using (IContactItem result = search.SearchOne()) using (IContactItem result = search.SearchOne())
{ {
Logger.Instance.Trace(this, "GAB Search for send-as {0}: {1}", zpush, result);
if (result != null) if (result != null)
{ {
// Try resolving by email // Try resolving by email
Logger.Instance.Trace(this, "Resolving send-as by email address {0}: {1}", user.UserName, result.Email1Address);
return ThisAddIn.Instance.ResolveRecipient(result.Email1Address); return ThisAddIn.Instance.ResolveRecipient(result.Email1Address);
} }
} }
} }
} }
else
{
Logger.Instance.Trace(this, "GAB handler not found for account: {0}", zpush);
} }
Logger.Instance.Warning(this, "Unable to resolve send-as: {0}", user.UserName);
return null; return null;
} }
else
{
Logger.Instance.Warning(this, "Unable to resolve send-as and GABLookup disabled: {0}", user.UserName);
return null;
}
}
private void MailEvents_ItemSend(IMailItem item, ref bool cancel) private void MailEvents_ItemSend(IMailItem item, ref bool cancel)
{ {