Merge pull request #89 from MoneyTools/clovet/CitibankVisa

Fix OFX parsing issue so that Citibank VISA cards

Author: clovett

Source/WPF/MoneyPackage/Package.appxmanifest

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities" IgnorableNamespaces="uap rescap">
-  <Identity Name="43906ChrisLovett.MyMoney.Net" Publisher="CN=Chris Lovett, O=Chris Lovett, S=Washington, C=US" Version="2.1.0.2" />
+  <Identity Name="43906ChrisLovett.MyMoney.Net" Publisher="CN=Chris Lovett, O=Chris Lovett, S=Washington, C=US" Version="2.1.0.3" />
   <Properties>
     <DisplayName>MyMoney.Net</DisplayName>
     <PublisherDisplayName>Chris Lovett</PublisherDisplayName>

Source/WPF/MyMoney/Controls/MoneyDataGrid.cs

@@ -47,6 +47,14 @@ public MoneyDataGrid()
             Loaded += this.OnLoaded;
         }
 
+        protected override void OnExecutedCommitEdit(ExecutedRoutedEventArgs e)
+        {
+            // This is the code path that is executed when the unit test uses the InvokePattern to
+            // commit the edit on the current edited row, but the default implementation in DataGrid
+            // doesn't do anything useful, so we intercept it here so the row is actually committed.
+            base.OnExecutedCommitEdit(e);
+        }
+
         public ContextMenu ParentMenu { get; set; }
 
         private void OnLoaded(object sender, RoutedEventArgs e)
@@ -742,6 +750,11 @@ protected override void OnRowEditEnding(DataGridRowEditEndingEventArgs e)
 
         private void OnStartEdit(DataGridColumn column, DataGridRow row, RoutedEventArgs args)
         {
+            IEditableCollectionView iecv = this.Items as IEditableCollectionView;
+            if (iecv != null)
+            {
+
+            }
             Control editor = this.GetCellEditor(column, row, args);
             if (editor != null)
             {

Source/WPF/MyMoney/Database/Money.cs

@@ -705,7 +705,7 @@ public partial class MyMoney : PersistentObject
         internal PayeeIndex payeeAccountIndex;
         private bool watching;
 
-        internal static Type[] GetKnownTypes()
+        public static Type[] GetKnownTypes()
         {
             return new Type[]
             {

Source/WPF/MyMoney/Dialogs/OnlineAccountDialog.xaml

@@ -14,8 +14,8 @@
         Title="Online Account"  
         WindowStartupLocation="CenterOwner" 
         WindowStyle="ToolWindow"
-        SizeToContent="WidthAndHeight" 
-        MinWidth="700"
+        SizeToContent="Height" 
+        MinWidth="700" Width="850"
         d:DesignHeight="600" d:DesignWidth="900">
 
     <Window.Resources>

Source/WPF/MyMoney/Ofx/Ofx.cs

@@ -6,7 +6,6 @@
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
-using System.Net;
 using System.Net.Http;
 using System.Net.Http.Headers;
 using System.Net.NetworkInformation;
@@ -348,7 +347,7 @@ private static XDocument LoadXmlStream(Stream fs)
             settings.ProhibitDtd = false;
 #pragma warning restore 618
             settings.ValidationType = ValidationType.None;
-            using (XmlReader reader = new StringTrimmingXmlReader(XmlReader.Create(fs, settings)))
+            using (XmlReader reader = XmlReader.Create(fs, settings))
             {
                 return XDocument.Load(reader);
             }
@@ -1025,43 +1024,6 @@ private async Task<XDocument> SendOfxRequest(XDocument doc, string oldFileUid, s
             }
         }
 
-        private string RemoveIndents(string msg)
-        {
-            StringBuilder sb = new StringBuilder();
-            foreach (string line in msg.Split('\n'))
-            {
-                sb.Append(line.Trim());
-                sb.Append("\n");
-            }
-            return sb.ToString();
-        }
-
-        private static string GetHttpHeaders(HttpWebResponse response)
-        {
-            string headers = string.Empty;
-            WebHeaderCollection col = response.Headers;
-            foreach (string key in col.AllKeys)
-            {
-                headers += key + "=" + col[key] + "<br/>";
-            }
-            return headers;
-        }
-
-        private static string GetResponseBody(HttpWebResponse resp)
-        {
-            try
-            {
-                using (StreamReader sr = new StreamReader(resp.GetResponseStream()))
-                {
-                    return sr.ReadToEnd();
-                }
-            }
-            catch
-            {
-                return null;
-            }
-        }
-
         private static void EnsurePathExists(string path)
         {
             if (!Directory.Exists(path))
@@ -1310,6 +1272,7 @@ internal static OFX DeserializeOfxResponse(XDocument doc)
         {
             try
             {
+                StripWhitespace(doc);
                 OFX ofx;
                 XmlSerializer s = new XmlSerializer(typeof(OFX));
                 using (XmlReader r = XmlReader.Create(new StringReader(doc.ToString())))
@@ -1838,8 +1801,22 @@ private static string GetLogFileLocation(XDocument doc)
             return null;
         }
 
+        private static void StripWhitespace(XDocument doc)
+        {
+            foreach (var node in doc.DescendantNodes())
+            {
+                if (node is XText t)
+                {
+                    t.Value = t.Value.Trim();
+                }
+            }
+        }
+
         public void ProcessResponse(XDocument doc, OfxDownloadData results)
         {
+            // So we don't have to do a .Trim() on every single selected value when parsing the response.
+            StripWhitespace(doc);
+
             XElement root = doc.Root;
             if (root == null || root.Name.LocalName != "OFX")
             {
@@ -1869,7 +1846,7 @@ public void ProcessResponse(XDocument doc, OfxDownloadData results)
                 e = doc.SelectElement("OFX/SIGNONMSGSRSV1/SONRS/STATUS/MESSAGE");
                 if (e != null)
                 {
-                    message += e.Value.Trim();
+                    message += e.Value;
                     results.AddError(this.OnlineAccount, this.Account, message);
                 }
                 return;
@@ -1920,7 +1897,7 @@ public void ProcessResponse(XDocument doc, OfxDownloadData results)
                     e = child.SelectElement("*/STATUS/MESSAGE");
                     if (e != null)
                     {
-                        message += e.Value.Trim();
+                        message += e.Value;
                         results.AddError(this.OnlineAccount, this.Account, message);
                     }
                 }
@@ -3472,14 +3449,14 @@ private static string ProcessStatementStatus(XElement tr, Account a)
             if (statusElement != null)
             {
                 XElement sc = statusElement.Element("CODE");
-                if (sc != null && sc.Value.Trim() != "0")
+                if (sc != null && sc.Value != "0")
                 {
                     string msg = (a == null) ? string.Empty : a.Name + ": ";
                     XElement severity = statusElement.Element("SEVERITY");
                     string reason = null;
                     if (severity != null)
                     {
-                        reason = severity.Value?.Trim();
+                        reason = severity.Value;
                     }
                     XElement message = statusElement.Element("MESSAGE");
                     if (message != null)
@@ -3489,7 +3466,7 @@ private static string ProcessStatementStatus(XElement tr, Account a)
                             reason += ", ";
                         }
 
-                        reason += message.Value?.Trim();
+                        reason += message.Value;
                     }
                     return msg + reason;
                 }
@@ -3829,107 +3806,5 @@ private void HandleChallenge(OFX ofx)
                 HelpLink = challengeLog
             });
         }
-
-
-    }
-
-    internal class StringTrimmingXmlReader : XmlReader
-    {
-        private readonly XmlReader inner;
-        public StringTrimmingXmlReader(XmlReader inner)
-        {
-            this.inner = inner;
-        }
-
-        protected override void Dispose(bool disposing)
-        {
-            this.inner.Dispose();
-            base.Dispose(disposing);
-        }
-
-        public override XmlNodeType NodeType => this.inner.NodeType;
-
-        public override string LocalName => this.inner.LocalName;
-
-        public override string NamespaceURI => this.inner.NamespaceURI;
-
-        public override string Prefix => this.inner.Prefix;
-
-        public override string Value => this.inner.Value?.Trim();
-
-        public override int Depth => this.inner.Depth;
-
-        public override string BaseURI => this.inner.BaseURI;
-
-        public override bool IsEmptyElement => this.inner.IsEmptyElement;
-
-        public override int AttributeCount => this.inner.AttributeCount;
-
-        public override bool EOF => this.inner.EOF;
-
-        public override ReadState ReadState => this.inner.ReadState;
-
-        public override XmlNameTable NameTable => this.inner.NameTable;
-
-        public override string GetAttribute(string name)
-        {
-            return this.inner.GetAttribute(name);
-        }
-
-        public override string GetAttribute(string name, string namespaceURI)
-        {
-            return this.inner.GetAttribute(name, namespaceURI);
-        }
-
-        public override string GetAttribute(int i)
-        {
-            return this.inner.GetAttribute(i);
-        }
-
-        public override string LookupNamespace(string prefix)
-        {
-            return this.inner.LookupNamespace(prefix);
-        }
-
-        public override bool MoveToAttribute(string name)
-        {
-            return this.inner.MoveToAttribute(name);
-        }
-
-        public override bool MoveToAttribute(string name, string ns)
-        {
-            return this.inner.MoveToAttribute(name, ns);
-        }
-
-        public override bool MoveToElement()
-        {
-            return this.inner.MoveToElement();
-        }
-
-        public override bool MoveToFirstAttribute()
-        {
-            return this.inner.MoveToFirstAttribute();
-        }
-
-        public override bool MoveToNextAttribute()
-        {
-            return this.inner.MoveToNextAttribute();
-        }
-
-        public override bool Read()
-        {
-            return this.inner.Read();
-        }
-
-        public override bool ReadAttributeValue()
-        {
-            return this.inner.ReadAttributeValue();
-        }
-
-        public override void ResolveEntity()
-        {
-            this.inner.ResolveEntity();
-        }
     }
-
 }

Source/WPF/MyMoney/Properties/PublishProfiles/ClickOnceProfile.pubxml

@@ -4,8 +4,8 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
 -->
 <Project>
   <PropertyGroup>
-    <ApplicationRevision>2</ApplicationRevision>
-    <ApplicationVersion>2.1.0.2</ApplicationVersion>
+    <ApplicationRevision>3</ApplicationRevision>
+    <ApplicationVersion>2.1.0.3</ApplicationVersion>
     <BootstrapperEnabled>True</BootstrapperEnabled>
     <Configuration>Release</Configuration>
     <CreateWebPageOnPublish>True</CreateWebPageOnPublish>

Source/WPF/MyMoney/Setup/changes.xml

@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <changes>
+  <change version="2.1.0.3" date="2/5/2022">
+    - Fix OFX parsing issue so that Citibank VISA cards Connect dialog works properly.
+    - Fix online banking documentation &amp; screenshots.
+    - Add backslash escaping support to escape a double quote in the quickfilter search box.
+  </change>
   <change version="2.1.0.2" date="1/30/2022">
     - Fix problem with open file dialog, where it was incorrectly inserting password from windows credential store on Sqllite databases.
     - Fix misleading documentation about Sqllite passwords.