From e17a71b5efa82831b130f8ea2407278e2edc612b Mon Sep 17 00:00:00 2001
From: David Shalaby <dave@taptrack.com>
Date: Mon, 23 Oct 2017 18:37:00 -0400
Subject: [PATCH] Removed check for EoF in IsValidFrame(), fixed null reference
 exception on reader disconnect, changed URL launching to not cease if a
 scanning error or non-URI tag is detected.

---
 Example/MainWindow.xaml                       |  2 +-
 Example/MainWindow.xaml.cs                    | 18 +++++++++-------
 Example/Properties/AssemblyInfo.cs            |  8 +++----
 Example/Tappy Tcmp Demo.csproj                | 16 +++++++-------
 Tcmp-SDK/Properties/AssemblyInfo.cs           |  4 ++--
 .../Bluetooth/BluetoothConnection.cs          |  5 ++++-
 Tcmp-SDK/Tcmp/Communication/TappyReader.cs    | 21 +++++++++----------
 Tcmp-SDK/Tcmp/Communication/TcmpFrame.cs      | 16 ++++++++------
 Tcmp-SDK/Tcmp/Communication/UsbConnection.cs  |  9 ++++----
 9 files changed, 55 insertions(+), 44 deletions(-)

diff --git a/Example/MainWindow.xaml b/Example/MainWindow.xaml
index 59f469f..85273e4 100644
--- a/Example/MainWindow.xaml
+++ b/Example/MainWindow.xaml
@@ -9,7 +9,7 @@
         xmlns:gif="http://wpfanimatedgif.codeplex.com"
         mc:Ignorable="d"
         WindowStartupLocation="CenterScreen"
-        Title="Tappy Demo 2.4" Height="650" Width="800" Foreground="{x:Null}" Background="{StaticResource LightBackground}">
+        Title="Tappy Demo 2.5" Height="650" Width="800" Foreground="{x:Null}" Background="{StaticResource LightBackground}">
     <Grid Background="{StaticResource LightBackground}">
         <Grid.RowDefinitions>
             <RowDefinition Height="50"/>
diff --git a/Example/MainWindow.xaml.cs b/Example/MainWindow.xaml.cs
index bdce83d..6ed6759 100644
--- a/Example/MainWindow.xaml.cs
+++ b/Example/MainWindow.xaml.cs
@@ -166,7 +166,8 @@ private void AddUID(ResponseFrame frame, Exception e)
 
         private void WriteURLButton_Click(object sender, RoutedEventArgs e)
         {
-            string url = string.Copy(urlTextBox.Text);
+
+			string url = string.Copy(urlTextBox.Text);
             Command cmd = new WriteUri((byte)timeout.Value, (bool)lockCheckBox.IsChecked, new NdefUri(url));
             Callback repeatCommand = null;
             bool repeat = (bool)repeatUrlWrite.IsChecked;
@@ -486,7 +487,7 @@ private void AutoDetectButton_Click(object sender, RoutedEventArgs e)
 				
                 tappy.SwitchProtocol(window.Protocol);
 
-					ShowPendingStatus("Searching for a Tappy");
+				ShowPendingStatus("Searching for a Tappy");
 
                 Task.Run(() =>
                 {
@@ -654,7 +655,7 @@ private void launchUrlButton_Click(object sender, RoutedEventArgs e)
 
         private void DetectandLaunch()
         {
-            Command cmd = new DetectSingleNdef(0, DetectTagSetting.Type2Type4AandMifare);
+            Command cmd = new StreamNdef(0, DetectTagSetting.Type2Type4AandMifare);
             tappy.SendCommand(cmd, LaunchCallback);
         }
 
@@ -737,12 +738,13 @@ private void disconnectButton_Click(object sender, RoutedEventArgs e)
         {
             try
             {
-                tappy.Disconnect();
-				tappy.DisconnectBlueGiga();
-                ShowSuccessStatus("Disconnect was successful");
+                tappy.Disconnect();	
+				ShowSuccessStatus("Disconnect was successful");
             }
-            catch
-            {
+            catch(Exception exc)
+
+			{
+				Console.Write(exc.ToString());
                 ShowFailStatus("Disconnect was unsuccessful");
             }
         }
diff --git a/Example/Properties/AssemblyInfo.cs b/Example/Properties/AssemblyInfo.cs
index a4c2316..bdac93f 100644
--- a/Example/Properties/AssemblyInfo.cs
+++ b/Example/Properties/AssemblyInfo.cs
@@ -8,9 +8,9 @@
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("Tappy Demo")]
-[assembly: AssemblyDescription("")]
+[assembly: AssemblyDescription("Tappy Reader Demo for Windows")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
+[assembly: AssemblyCompany("TapTrack (TM)")]
 [assembly: AssemblyProduct("Tappy Demo")]
 [assembly: AssemblyCopyright("Copyright ©  2017")]
 [assembly: AssemblyTrademark("")]
@@ -51,7 +51,7 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.4.0.0")]
-[assembly: AssemblyFileVersion("2.4.0.0")]
+[assembly: AssemblyVersion("2.5.0.0")]
+[assembly: AssemblyFileVersion("2.5.0.0")]
 [assembly: NeutralResourcesLanguage("en-CA")]
 
diff --git a/Example/Tappy Tcmp Demo.csproj b/Example/Tappy Tcmp Demo.csproj
index f78cdf6..c55039a 100644
--- a/Example/Tappy Tcmp Demo.csproj	
+++ b/Example/Tappy Tcmp Demo.csproj	
@@ -8,7 +8,7 @@
     <OutputType>WinExe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>TapTrack.Demo</RootNamespace>
-    <AssemblyName>Tappy Demo 2.4</AssemblyName>
+    <AssemblyName>Tappy Demo 2.5</AssemblyName>
     <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
@@ -49,7 +49,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <DocumentationFile>bin\Debug\Tappy Demo 2.4.xml</DocumentationFile>
+    <DocumentationFile>bin\Debug\Tappy Demo 2.5.xml</DocumentationFile>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -59,7 +59,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <DocumentationFile>bin\Release\Tappy Demo 2.4.xml</DocumentationFile>
+    <DocumentationFile>bin\Release\Tappy Demo 2.5.xml</DocumentationFile>
   </PropertyGroup>
   <PropertyGroup>
     <ManifestCertificateThumbprint>DA55EDA3D657C041EF308F9D8CDF1B5A4950F2E4</ManifestCertificateThumbprint>
@@ -102,9 +102,6 @@
     <Reference Include="System.Xaml">
       <RequiredTargetFramework>4.0</RequiredTargetFramework>
     </Reference>
-    <Reference Include="TapTrack.Tcmp">
-      <HintPath>..\Tcmp-SDK\bin\Debug\TapTrack.Tcmp.dll</HintPath>
-    </Reference>
     <Reference Include="WindowsBase" />
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
@@ -659,7 +656,12 @@
   <ItemGroup>
     <Resource Include="Resources\keyboard_highlight.png" />
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <ProjectReference Include="..\Tcmp-SDK\TapTrack.Tcmp.csproj">
+      <Project>{cd277ef8-6666-4b0c-b482-9eafa662732e}</Project>
+      <Name>TapTrack.Tcmp</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/Tcmp-SDK/Properties/AssemblyInfo.cs b/Tcmp-SDK/Properties/AssemblyInfo.cs
index 923e3b4..bdca02f 100644
--- a/Tcmp-SDK/Properties/AssemblyInfo.cs
+++ b/Tcmp-SDK/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.5.1.0")]
-[assembly: AssemblyFileVersion("0.5.1.0")]
+[assembly: AssemblyVersion("0.5.2.0")]
+[assembly: AssemblyFileVersion("0.5.2.0")]
diff --git a/Tcmp-SDK/Tcmp/Communication/Bluetooth/BluetoothConnection.cs b/Tcmp-SDK/Tcmp/Communication/Bluetooth/BluetoothConnection.cs
index 7cbfa9f..e2ecc68 100644
--- a/Tcmp-SDK/Tcmp/Communication/Bluetooth/BluetoothConnection.cs
+++ b/Tcmp-SDK/Tcmp/Communication/Bluetooth/BluetoothConnection.cs
@@ -256,7 +256,10 @@ public override void DisconnectBlueGiga()
 		public override void Disconnect()
         {
 			if (device?.ConnectionHandle != null && (port?.IsOpen) != null)
-				bluetooth.SendCommand(port, bluetooth.BLECommandConnectionDisconnect((byte)device.ConnectionHandle));			
+			{
+				bluetooth.SendCommand(port, bluetooth.BLECommandConnectionDisconnect((byte)device.ConnectionHandle));
+				DisconnectBlueGiga();
+			}
 		}
 
 		public override string[] GetAvailableDevices()
diff --git a/Tcmp-SDK/Tcmp/Communication/TappyReader.cs b/Tcmp-SDK/Tcmp/Communication/TappyReader.cs
index 789c96b..cb48467 100644
--- a/Tcmp-SDK/Tcmp/Communication/TappyReader.cs
+++ b/Tcmp-SDK/Tcmp/Communication/TappyReader.cs
@@ -174,7 +174,7 @@ private void DataReceivedHandler(object sender, EventArgs e)
 
             ResponseFrame resp;
 
-            buffer = TcmpFrame.RemoveEscapseCharacters(buffer.ToArray());
+            buffer = TcmpFrame.RemoveEscapeCharacters(buffer.ToArray());
 
             for (int i = 0; i < buffer.Count; i++)
             {
@@ -263,15 +263,14 @@ public void FlushBuffer()
 
 		public bool ConnectByName(string tappyName)
 		{
-			foreach (string name in conn.GetAvailableDevices())
-			{
-				if (name.ToUpper() == tappyName.ToUpper())
+				foreach (string name in conn.GetAvailableDevices())
 				{
-					return Connect(tappyName);
+					if (name.ToUpper() == tappyName.ToUpper())
+					{
+						return Connect(tappyName);
+					}
 				}
-			}
-			return false;
-
+				return false;			
 		}
 
 
@@ -279,7 +278,7 @@ public bool ConnectByName(string tappyName)
 		/// Connect to a Tappy device by the device name (TAPPY123) when it is in kiosk/keyboard wedge mode
 		/// </summary>
 		/// <returns>True if connection to a Tappy device was successful, false otherwise</returns>
-
+		/// 
 		public bool ConnectKioskKeyboardWedgeByName(string tappyName)
 		{
 			foreach (string name in conn.GetAvailableDevices())
@@ -290,7 +289,6 @@ public bool ConnectKioskKeyboardWedgeByName(string tappyName)
 				}
 			}
 			return false;
-
 		}
 
 
@@ -327,6 +325,7 @@ public string[] FindNearbyTappyBLEs(int timeout)
 			
 		}
 
+
 		/// <summary>
 		/// Switch between USB or Bluetooth modes
 		/// </summary>
@@ -422,7 +421,7 @@ public string[] GetAvailableDevices()
         public string DeviceName
         {
             get;
-            set;
+            private set;
         }
 
         /// <summary>
diff --git a/Tcmp-SDK/Tcmp/Communication/TcmpFrame.cs b/Tcmp-SDK/Tcmp/Communication/TcmpFrame.cs
index affc795..893071c 100644
--- a/Tcmp-SDK/Tcmp/Communication/TcmpFrame.cs
+++ b/Tcmp-SDK/Tcmp/Communication/TcmpFrame.cs
@@ -236,8 +236,12 @@ protected byte[] AddEscapeChars(params byte[] data)
 
             return temp.ToArray();
         }
+		public static List<byte> RemoveEscapseCharacters(byte[] data) //legacy incorrect spelling in case someone ever called this explicitly 
+		{
+			return RemoveEscapeCharacters(data);
+		}
 
-        public static List<byte> RemoveEscapseCharacters(byte[] data)
+		public static List<byte> RemoveEscapeCharacters(byte[] data)
         {
             List<byte> temp = new List<byte>(data);
 
@@ -285,14 +289,14 @@ public static bool IsValidFrame(TcmpFrame frame)
         {
             if (frame == null)
                 return false;
+		
+			byte[] contents = frame.ToArray();
 
-            byte[] contents = frame.ToArray();
-
-            if (contents.Length < 10)
+			if (contents.Length < 10)
                 return false;
 
-            if (contents[0] != 0x7E || contents[contents.Length - 1] != 0x7E)
-                return false;
+            if (contents[0] != 0x7E)
+				return false;
 
             if (HasLcsError(frame.Len1, frame.Len0, frame.Lcs))
                 return false;
diff --git a/Tcmp-SDK/Tcmp/Communication/UsbConnection.cs b/Tcmp-SDK/Tcmp/Communication/UsbConnection.cs
index 2a8be49..b4e74df 100644
--- a/Tcmp-SDK/Tcmp/Communication/UsbConnection.cs
+++ b/Tcmp-SDK/Tcmp/Communication/UsbConnection.cs
@@ -29,13 +29,14 @@ public override bool Connect(string portName)
             try
             {
                 Disconnect();
-                port.PortName = portName;
-                port.Open();
-                return true;
+				port.PortName = portName;
+				port.Open();		
+				return true;
             }
             catch
             {
-                return false;
+				port.PortName = null;
+				return false;
             }
         }