Merge pull request #9 from GhostwareDev/development

Bugfix proxy

Author: kevingoos

GPS.NET/Ghostware.GPS.NET.GPSDWpfApplication/MainWindow.xaml.cs

@@ -5,7 +5,6 @@
 using System.Threading.Tasks;
 using System.Windows;
 using Ghostware.GPS.NET.Models.ConnectionInfo;
-using Ghostware.GPS.NET.Models.ConnectionInfo.Credentials;
 using Ghostware.GPS.NET.Models.Events;
 
 namespace Ghostware.GPS.NET.GPSDWpfApplication

GPS.NET/Ghostware.GPS.NET/Encryption/StringEncryption.cs

@@ -2,7 +2,7 @@
 <package >
   <metadata>
     <id>Ghostware.GPS.NET</id>
-    <version>1.0.5</version>
+    <version>1.0.6</version>
     <title>Ghostware.GPS.NET</title>
     <authors>Kevin Goos</authors>
     <owners>Ghostware</owners>
@@ -18,6 +18,10 @@
       - Using the Windows location API. (Starting from windows 7)
     </description>
     <releaseNotes>
+       v1.0.6:
+      --------
+      - Breaking GPSD Proxy bugfix
+      
       v1.0.5:
       --------
       - Added Securestring for proxy password

GPS.NET/Ghostware.GPS.NET/Extensions/StringExtensions.cs

@@ -39,22 +39,17 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
-    <Reference Include="System.ComponentModel.Composition" />
     <Reference Include="System.Core" />
     <Reference Include="System.Device" />
     <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.Security" />
     <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data" />
-    <Reference Include="System.Net.Http" />
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Constants\GpsdConstants.cs" />
     <Compile Include="Converters\CoordinateConverterUtilities.cs" />
-    <Compile Include="Encryption\StringEncryption.cs" />
     <Compile Include="Enums\FileType.cs" />
     <Compile Include="Enums\GpsCoordinateSystem.cs" />
     <Compile Include="Enums\GpsStatus.cs" />
@@ -64,7 +59,6 @@
     <Compile Include="Exceptions\NoGpsFoundException.cs" />
     <Compile Include="Exceptions\NotConnectedException.cs" />
     <Compile Include="Exceptions\UnknownTypeException.cs" />
-    <Compile Include="Extensions\StringExtensions.cs" />
     <Compile Include="Factories\GpsClientFactory.cs" />
     <Compile Include="Factories\GpsDataFactory.cs" />
     <Compile Include="GpsClients\ComPortGpsClient.cs" />

GPS.NET/Ghostware.GPS.NET/GPS.NET.nuspec

@@ -1,11 +1,9 @@
 using System;
 using System.Globalization;
 using System.IO;
-using System.Linq;
 using System.Threading;
 using Ghostware.GPS.NET.Enums;
 using Ghostware.GPS.NET.Exceptions;
-using Ghostware.GPS.NET.Extensions;
 using Ghostware.GPS.NET.Models.ConnectionInfo;
 using Ghostware.GPS.NET.Models.Events;
 using Ghostware.GPS.NET.Models.GpsdModels;

GPS.NET/Ghostware.GPS.NET/Ghostware.GPS.NET.csproj

@@ -48,9 +48,7 @@ public override bool Connect()
 
             try
             {
-                _client = data.ProxyCredentials != null
-                    ? ProxyClientHandler.GetTcpClient(data)
-                    : new TcpClient(data.Address, data.Port);
+                _client = data.IsProxyEnabled ? ProxyClientHandler.GetTcpClient(data) : new TcpClient(data.Address, data.Port);
                 _streamReader = new StreamReader(_client.GetStream());
                 _streamWriter = new StreamWriter(_client.GetStream());