Commit 13ae48c7 authored by David Kline's avatar David Kline Committed by GitHub
Browse files

Merge pull request #178 from davidkline-ms/master 

simplify getting the websocket uri. no longer uses regular expressions
parents 7f096085 d3b6e7d6

WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.UniversalWindows/DefaultDevicePortalConnection.cs

+6 −13
Original line number Diff line number Diff line
@@ -6,10 +6,6 @@ 


using System;

using System.Net;

using System.Text.RegularExpressions;

using Windows.Foundation;

using Windows.Security.Cryptography.Certificates;

using Windows.Storage.Streams;

using static Microsoft.Tools.WindowsDevicePortal.DevicePortal;



namespace Microsoft.Tools.WindowsDevicePortal
@@ -57,16 +53,13 @@ namespace Microsoft.Tools.WindowsDevicePortal 
                    return null;

                }



                string absoluteUri = this.Connection.AbsoluteUri;

                // Convert the scheme from http[s] to ws[s].

                string scheme = this.Connection.Scheme.Equals("https", StringComparison.OrdinalIgnoreCase) ? "wss" : "ws";



                if (absoluteUri.StartsWith("https", StringComparison.OrdinalIgnoreCase))

                {

                    return new Uri(Regex.Replace(absoluteUri, "https", "wss", RegexOptions.IgnoreCase | RegexOptions.CultureInvariant));

                }

                else

                {

                    return new Uri(Regex.Replace(absoluteUri, "http", "ws", RegexOptions.IgnoreCase | RegexOptions.CultureInvariant));

                }

                return new Uri(

                    string.Format("{0}://{1}",

                        scheme,

                        this.Connection.Authority));

            }

        }

WindowsDevicePortalWrapper/WindowsDevicePortalWrapper/DefaultDevicePortalConnection.cs

+6 −10
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@ using System; 
using System.Net;

using System.Net.Security;

using System.Security.Cryptography.X509Certificates;

using System.Text.RegularExpressions;

using static Microsoft.Tools.WindowsDevicePortal.DevicePortal;



namespace Microsoft.Tools.WindowsDevicePortal
@@ -66,16 +65,13 @@ namespace Microsoft.Tools.WindowsDevicePortal 
                    return null;

                }



                string absoluteUri = this.Connection.AbsoluteUri;

                // Convert the scheme from http[s] to ws[s].

                string scheme = this.Connection.Scheme.Equals("https", StringComparison.OrdinalIgnoreCase) ? "wss" : "ws";



                if (absoluteUri.StartsWith("https", StringComparison.OrdinalIgnoreCase))

                {

                    return new Uri(Regex.Replace(absoluteUri, "https", "wss", RegexOptions.IgnoreCase | RegexOptions.CultureInvariant));

                }

                else

                {

                    return new Uri(Regex.Replace(absoluteUri, "http", "ws", RegexOptions.IgnoreCase | RegexOptions.CultureInvariant));

                }

                return new Uri(

                    string.Format("{0}://{1}",

                        scheme,

                        this.Connection.Authority));

            }

        }