PR_PRIMARY_SEND_ACCT smtp address should be lastindexof \u0001

currently returns entire string instead of only smtp address.
gumtreehill · Sep 5, 2018 · 7fa4c75 · 7fa4c75
1 parent fabda98
commit 7fa4c75
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/MsgReaderCore/Outlook/Message.cs b/MsgReaderCore/Outlook/Message.cs
@@ -1761,10 +1761,11 @@ private void SetEmailSenderAndRepresentingSender()
                 // PR_PRIMARY_SEND_ACCT can contain the smtp address of an exchange account
                 if (string.IsNullOrEmpty(tempEmail) || tempEmail.IndexOf("@", StringComparison.Ordinal) < 0)
                 {
+                    var testSeparator = "\u0001";
                     var testEmail = GetMapiPropertyString(MapiTags.PR_PRIMARY_SEND_ACCT);
-                    if(!string.IsNullOrEmpty(testEmail) && testEmail.IndexOf("\u0001", StringComparison.Ordinal) > 0)
+                    if(!string.IsNullOrEmpty(testEmail) && testEmail.IndexOf(testSeparator, StringComparison.Ordinal) > 0)
                     {
-                        testEmail = testEmail.Substring(testEmail.IndexOf("\u0001", StringComparison.Ordinal));
+                        testEmail = testEmail.Substring(testEmail.LastIndexOf(testSeparator, StringComparison.Ordinal) + testSeparator.Length);
                         if (string.IsNullOrEmpty(testEmail) || testEmail.LastIndexOf("@", StringComparison.Ordinal) > 0)
                             tempEmail = testEmail;
                     }
@@ -1773,10 +1774,11 @@ private void SetEmailSenderAndRepresentingSender()
 
                 //if (string.IsNullOrEmpty(tempEmail) || tempEmail.IndexOf("@", StringComparison.Ordinal) < 0)
                 //{
+                //    var testSeparator = "\u0001";
                 //    var testEmail = GetMapiPropertyString(MapiTags.PR_NEXT_SEND_ACCT);
-                //    if (!string.IsNullOrEmpty(testEmail) && testEmail.IndexOf("\u0001", StringComparison.Ordinal) > 0)
+                //    if (!string.IsNullOrEmpty(testEmail) && testEmail.IndexOf(testSeparator, StringComparison.Ordinal) > 0)
                 //    {
-                //        testEmail = testEmail.Substring(testEmail.IndexOf("\u0001", StringComparison.Ordinal));
+                //        testEmail = testEmail.Substring(testEmail.LastIndexOf(testSeparator, StringComparison.Ordinal) + testSeparator.Length);
                 //        if (string.IsNullOrEmpty(testEmail) || testEmail.LastIndexOf("@", StringComparison.Ordinal) > 0)
                 //            tempEmail = testEmail;
                 //    }

diff --git a/MsgViewer/ViewerForm.cs b/MsgViewer/ViewerForm.cs
@@ -191,6 +191,9 @@ private void OpenFile(string fileName)
 
                 var msgReader = new Reader();
 
+                var aa = new MsgReader.Outlook.Storage.Message(fileName);
+                aa.Dispose();
+
                 // Use this, if you want to extract the code in memory
                 // using (var streamReader = new StreamReader(fileName))
                 // {