Use Launcher to open links

Author: maxkatz6

Directory.Build.props

@@ -11,7 +11,7 @@
 
   <PropertyGroup>
     <AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
-    <AvaloniaVersion>11.0.11</AvaloniaVersion>
+    <AvaloniaVersion>11.1.0</AvaloniaVersion>
     <AvaloniaSamplesVersion>11.3.0-beta2</AvaloniaSamplesVersion>
   </PropertyGroup>
 

external/HtmlRenderer/Adapters/RAdapter.cs

@@ -257,6 +257,15 @@ public void SetToClipboard(string text)
             SetToClipboardInt(text);
         }
 
+        /// <summary>
+        /// Opens the specified URL in the default web browser.
+        /// </summary>
+        /// <param name="url">The URL to open.</param>
+        public void OpenLink(string url)
+        {
+            OpenLinkInt(url);
+        }
+        
         /// <summary>
         /// Set the given html and plain text data to clipboard.<br/>
         /// Not relevant for platforms that don't render HTML on UI element.
@@ -414,6 +423,15 @@ protected virtual void SetToClipboardInt(string text)
             throw new NotImplementedException();
         }
 
+        /// <summary>
+        /// Opens the specified URL in the default web browser.
+        /// </summary>
+        /// <param name="url">The URL to open.</param>
+        protected virtual void OpenLinkInt(string text)
+        {
+            throw new NotImplementedException();
+        }
+
         /// <summary>
         /// Set the given html and plain text data to clipboard.
         /// </summary>

external/HtmlRenderer/Core/Handlers/ImageLoadHandler.cs

@@ -15,6 +15,7 @@
 using System.IO;
 using System.Text;
 using System.Threading;
+using System.Threading.Tasks;
 using TheArtOfDev.HtmlRenderer.Adapters;
 using TheArtOfDev.HtmlRenderer.Adapters.Entities;
 using TheArtOfDev.HtmlRenderer.Core.Entities;
@@ -284,7 +285,7 @@ private void SetImageFromFile(FileInfo source)
                 if (_htmlContainer.AvoidAsyncImagesLoading)
                     LoadImageFromFile(source.FullName);
                 else
-                    ThreadPool.QueueUserWorkItem(state => LoadImageFromFile(source.FullName));
+                    Task.Run(() => LoadImageFromFile(source.FullName));
             }
             else
             {

external/HtmlRenderer/Core/HtmlContainerInt.cs

@@ -964,9 +964,7 @@ internal void HandleLinkClicked(RControl parent, RPoint location, CssBox link)
                 }
                 else
                 {
-                    var nfo = new ProcessStartInfo(link.HrefLink);
-                    nfo.UseShellExecute = true;
-                    Process.Start(nfo);
+                    _adapter.OpenLink(link.HrefLink);
                 }
             }
         }

external/HtmlRenderer/Core/Utils/CommonUtils.cs

@@ -191,21 +191,6 @@ public static FileInfo TryGetFileInfo(string path)
             return null;
         }
 
-        /// <summary>
-        /// Get web client response content type.
-        /// </summary>
-        /// <param name="client">the web client to get the response content type from</param>
-        /// <returns>response content type or null</returns>
-        public static string GetResponseContentType(WebClient client)
-        {
-            foreach (string header in client.ResponseHeaders)
-            {
-                if (header.Equals("Content-Type", StringComparison.InvariantCultureIgnoreCase))
-                    return client.ResponseHeaders[header];
-            }
-            return null;
-        }
-
         /// <summary>
         /// Gets the representation of the online uri on the local disk.
         /// </summary>

src/Avalonia.HtmlRenderer/Adapters/AvaloniaAdapter.cs

@@ -134,6 +134,12 @@ protected override void SetToClipboardInt(string text)
             _ = topLevel?.Clipboard?.SetTextAsync(text);
         }
 
+        protected override void OpenLinkInt(string link)
+        {
+            var topLevel = TryGetTopLevel();
+            _ = topLevel?.Launcher.LaunchUriAsync(new Uri(link));
+        }
+
         protected override void SetToClipboardInt(string html, string plainText)
         {
             var topLevel = TryGetTopLevel();