From 9d27f111bfda97f9e4978228d09a99f19d329b4e Mon Sep 17 00:00:00 2001
From: Matt Portune <59324545+mportune-bw@users.noreply.github.com>
Date: Wed, 29 Apr 2020 13:09:46 -0400
Subject: [PATCH] Additional uri parsing intelligence (#861)

---
 src/Android/Accessibility/AccessibilityHelpers.cs | 8 ++++++--
 src/Core/Utilities/CoreHelpers.cs                 | 8 ++++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/Android/Accessibility/AccessibilityHelpers.cs b/src/Android/Accessibility/AccessibilityHelpers.cs
index ce6142706..5c2295837 100644
--- a/src/Android/Accessibility/AccessibilityHelpers.cs
+++ b/src/Android/Accessibility/AccessibilityHelpers.cs
@@ -164,9 +164,13 @@ namespace Bit.Droid.Accessibility
                 {
                     return uri;
                 }
-                if (Uri.TryCreate("http://" + uri, UriKind.Absolute, out var uri3))
+                var hasHttpProtocol = uri.StartsWith("http://") || uri.StartsWith("https://");
+                if (!hasHttpProtocol && uri.Contains("."))
                 {
-                    return string.Concat("http://", uri);
+                    if (Uri.TryCreate("http://" + uri, UriKind.Absolute, out var uri3))
+                    {
+                        return string.Concat("http://", uri);
+                    }
                 }
             }
             return uri;
diff --git a/src/Core/Utilities/CoreHelpers.cs b/src/Core/Utilities/CoreHelpers.cs
index d8f1e2525..47f167d5f 100644
--- a/src/Core/Utilities/CoreHelpers.cs
+++ b/src/Core/Utilities/CoreHelpers.cs
@@ -89,9 +89,13 @@ namespace Bit.Core.Utilities
             {
                 return uri;
             }
-            if (Uri.TryCreate("http://" + uriString, UriKind.Absolute, out var uri2))
+            var hasHttpProtocol = uriString.StartsWith("http://") || uriString.StartsWith("https://");
+            if (!hasHttpProtocol && uriString.Contains("."))
             {
-                return uri2;
+                if (Uri.TryCreate("http://" + uriString, UriKind.Absolute, out var uri2))
+                {
+                    return uri2;
+                }
             }
             return null;
         }