add User agent modes

HybridWebView/Droid/HybridWebViewRenderer.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
@@ -22,6 +22,8 @@ namespace Plugin.HybridWebView.Droid
     /// </summary>
     public class HybridWebViewRenderer : ViewRenderer<HybridWebViewControl, Android.Webkit.WebView>
     {
+        private static string defaultUserAgent;
+
         public static string MimeType = "text/html";
 
         public static string EncodingType = "UTF-8";
@@ -133,6 +135,7 @@ private void SetupControl()
 
             HybridWebViewControl.CallbackAdded += OnCallbackAdded;
             SetNativeControl(webView);
+            defaultUserAgent = Control.Settings.UserAgentString;
             SetUserAgent();
             OnControlChanged?.Invoke(this, webView);
         }
@@ -200,7 +203,7 @@ private Task OnClearCookiesRequest()
                 cookieSyncMngr.StopSync();
                 cookieSyncMngr.Sync();
             }
-            
+
             return Task.CompletedTask;
         }
 
@@ -461,7 +464,18 @@ private void SetUserAgent(object sender = null, EventArgs e = null)
         {
             if (Control != null && Element.UserAgent != null && Element.UserAgent.Length > 0)
             {
-                Control.Settings.UserAgentString = Element.UserAgent;
+                switch (Element.UserAgentMode)
+                {
+                    case UserAgentMode.Replace:
+                        Control.Settings.UserAgentString = Element.UserAgent;
+                        break;
+                    case UserAgentMode.Append:
+                        Control.Settings.UserAgentString = $"{defaultUserAgent} {Element.UserAgent}";
+                        break;
+                    case UserAgentMode.Prepend:
+                        Control.Settings.UserAgentString = $"{Element.UserAgent} {defaultUserAgent}";
+                        break;
+                }
             }
         }
     }

HybridWebView/HybridWebView.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <!--Work around so the conditions work below-->
     <TargetFrameworks></TargetFrameworks>
-    <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">netstandard1.0;netstandard2.0;Xamarin.iOS10;MonoAndroid81;uap10.0.18362;Xamarin.Mac20</TargetFrameworks>
+    <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">netstandard1.0;netstandard2.0;Xamarin.iOS10;MonoAndroid81;uap10.0.18362;net6.0-windows10.0.19041;Xamarin.Mac20</TargetFrameworks>
     <TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netstandard1.0;netstandard2.0;Xamarin.iOS10;MonoAndroid81;Xamarin.Mac20</TargetFrameworks>
     <!--Feel free to add as many targets as you need below
     netstandard1.0;netstandard2.0;MonoAndroid81;Xamarin.iOS10;uap10.0.16299;Xamarin.TVOS10;Xamarin.WatchOS10;Xamarin.Mac20;Tizen40
@@ -12,7 +12,7 @@
     <AssemblyName>Plugin.HybridWebView</AssemblyName>
     <RootNamespace>Plugin.HybridWebView</RootNamespace>
     <PackageId>Plugin.HybridWebView</PackageId>
-    
+
     <Product>$(AssemblyName) ($(TargetFramework))</Product>
     <AssemblyVersion>1.0.0.2</AssemblyVersion>
     <AssemblyFileVersion>1.0.0.2</AssemblyFileVersion>
@@ -22,26 +22,26 @@
     <NeutralLanguage>en</NeutralLanguage>
     <LangVersion>default</LangVersion>
     <DefineConstants>$(DefineConstants);</DefineConstants>
-    
+
     <UseFullSemVerForNuGet>false</UseFullSemVerForNuGet>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
 
     <LangVersion>latest</LangVersion>
     <DebugType>portable</DebugType>
-    
+
     <!--TODO: Fill these in-->
     <license>https://github.com/devsmadeofsteel/Plugin.HybridWebView/blob/master/LICENCE.md</license>
     <PackageProjectUrl>https://github.com/devsmadeofsteel/Plugin.HybridWebView</PackageProjectUrl>
     <RepositoryUrl>https://github.com/devsmadeofsteel/Plugin.HybridWebView</RepositoryUrl>
     <PackageReleaseNotes>RELEASE NOTES</PackageReleaseNotes>
     <PackageIconUrl>ICON URL</PackageIconUrl>
     <PackageTags>xamarin, windows, ios, android, xamarin.forms, plugin, HybridWebView, webview</PackageTags>
-    
+
     <Title>HybridWebView Plugin for Xamarin and Windows</Title>
     <Summary>Xamarin Plugin for a HybridWebView</Summary>
     <Description>Lightweight cross platform WebView designed to leverage the native WebView components in Android, iOS, and Windows to provide enhanced functionality over the base control.</Description>
-    
-    
+
+
     <Owners>Vinicius Dutra</Owners>
     <Authors>Ryan Dixon, Vinicius Dutra</Authors>
     <Copyright>Copyright 2018</Copyright>
@@ -76,6 +76,18 @@
     -->
   </ItemGroup>
 
+  <PropertyGroup Condition=" $(TargetFramework.Contains('-windows10')) ">
+    <UseMaui>true</UseMaui>
+    <ImplicitUsings>enable</ImplicitUsings>
+
+    <SupportedOSPlatformVersion>10.0.17763.0</SupportedOSPlatformVersion>
+    <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
+  </PropertyGroup>
+  <ItemGroup Condition=" $(TargetFramework.Contains('-windows10')) ">
+    <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.0.0" />
+    <Compile Include="Windows\**\*.cs" />
+  </ItemGroup>
+
   <ItemGroup Condition=" $(TargetFramework.StartsWith('MonoAndroid')) ">
     <Compile Include="Droid\**\*.cs" />
   </ItemGroup>
@@ -103,11 +115,11 @@
 
 
 
-  
+
    <ItemGroup Condition=" $(TargetFramework.StartsWith('netcoreapp')) ">
     <Compile Include="**\*.netcore.cs" />
   </ItemGroup>
-  
+
   <ItemGroup Condition=" $(TargetFramework.StartsWith('Tizen')) ">
     <Compile Include="**\*.tizen.cs" />
     <PackageReference Include="Tizen.NET" Version="4.0.0" />

HybridWebView/Shared/Enumerations/UserAgentMode.cs

@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Plugin.HybridWebView.Shared.Enumerations
+{
+	public enum UserAgentMode
+	{
+		Replace = 0,
+		Append = 1,
+		Prepend = 2,
+	}
+}

HybridWebView/Shared/HybridWebViewControl.cs

@@ -1,4 +1,4 @@
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
 using System.Net;
@@ -201,6 +201,22 @@ public string UserAgent
             }
         }
 
+        /// <summary>
+        /// Bindable property to control the user agent mode
+        /// </summary>
+        public UserAgentMode UserAgentMode
+        {
+            get => (UserAgentMode)GetValue(UserAgentModeProperty);
+            set
+            {
+                if (UserAgentMode == value)
+                    return;
+
+                SetValue(UserAgentModeProperty, value);
+                OnUserAgentChanged?.Invoke(this, EventArgs.Empty);
+            }
+        }
+
         public HybridWebViewControl()
         {
             HorizontalOptions = VerticalOptions = LayoutOptions.FillAndExpand;

HybridWebView/Shared/HybridWebViewControl.static.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using Plugin.HybridWebView.Shared.Enumerations;
 using Xamarin.Forms;
@@ -76,6 +76,12 @@ public partial class HybridWebViewControl
         public static readonly BindableProperty UserAgentProperty =
             BindableProperty.Create(nameof(UserAgent), typeof(string), typeof(HybridWebViewControl), "");
 
+        /// <summary>
+        /// A bindable property for the UserAgentMode property.
+        /// </summary>
+        public static readonly BindableProperty UserAgentModeProperty =
+            BindableProperty.Create(nameof(UserAgentMode), typeof(UserAgentMode), typeof(HybridWebViewControl), Shared.Enumerations.UserAgentMode.Replace);
+
         /// <summary>
         /// A dictionary used to add headers which are used throughout all instances of FormsWebView.
         /// </summary>

HybridWebView/UWP/HybridWebViewRenderer.cs

@@ -1,9 +1,11 @@
-using Plugin.HybridWebView.Shared;
+using Plugin.HybridWebView.Shared;
 using Plugin.HybridWebView.Shared.Enumerations;
 using Plugin.HybridWebView.UWP;
 using System;
 using System.Collections.Generic;
 using System.Net;
+using System.Runtime.InteropServices;
+using System.Text;
 using System.Threading.Tasks;
 using Windows.Security.Cryptography.Certificates;
 using Windows.UI.Xaml.Controls;
@@ -26,6 +28,9 @@ public class HybridWebViewRenderer : ViewRenderer<Shared.HybridWebViewControl, W
         public static string BaseUrl { get; set; } = "ms-appx:///";
         private LocalFileStreamResolver _resolver;
 
+        [DllImport("urlmon.dll", CharSet = CharSet.Ansi)]
+        private static extern int UrlMkGetSessionOption(int dwOption, StringBuilder pBuffer, int dwBufferLength, out int pdwBufferLength, int dwReserved);
+
         public static void Initialize()
         {
             // ReSharper disable once UnusedVariable
@@ -154,6 +159,20 @@ private void NavigateWithCustomUserAgent(WebViewNavigationStartingEventArgs args
             {
                 // Create new request with custom user agent
                 var requestMsg = new Windows.Web.Http.HttpRequestMessage(HttpMethod.Get, args.Uri);
+                if (Element.UserAgentMode != UserAgentMode.Replace)
+                {
+                    var userAgentBuilder = new StringBuilder(256);
+                    UrlMkGetSessionOption(0x10000001, userAgentBuilder, userAgentBuilder.Capacity - 1, out var length, 0);
+                    switch (Element.UserAgentMode)
+                    {
+                        case UserAgentMode.Append:
+                            userAgent = $"{userAgentBuilder} {Element.UserAgent}";
+                            break;
+                        case UserAgentMode.Prepend:
+                            userAgent = $"{Element.UserAgent} {userAgentBuilder}";
+                            break;
+                    }
+                }
                 requestMsg.Headers.Add("User-Agent", userAgent);
                 Control.NavigateWithHttpRequestMessage(requestMsg);
             }