Merge pull request #18546 from unoplatform/dev/spouliot/HttpRequestHe…

…aderCollection fix: add minimum API HttpRequestHeaderCollection to work
unoplatform · Nov 14, 2024 · 5f62952 · 5f62952
2 parents e17cd40 + d910ed2
commit 5f62952
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 6 deletions.
diff --git a/src/Uno.UI/UI/Xaml/Controls/WebView/Core/CoreWebView2.cs b/src/Uno.UI/UI/Xaml/Controls/WebView/Core/CoreWebView2.cs
@@ -155,7 +155,7 @@ internal void OnOwnerApplyTemplate()
 	{
 		_nativeWebView = GetNativeWebViewFromTemplate();
 
-		//The nativate WebView already navigate to a blank page if no source is set.
+		//The native WebView already navigate to a blank page if no source is set.
 		//Avoid a bug where invoke GoBack() on WebView do nothing in Android 4.4
 		UpdateFromInternalSource();
 		OnScrollEnabledChanged(_scrollEnabled);
@@ -280,8 +280,16 @@ private void UpdateFromInternalSource()
 		{
 			_nativeWebView.ProcessNavigation(html);
 		}
-		else if (_processedSource is HttpRequestMessage httpRequestMessage)
+		else if (_processedSource is global::Windows.Web.Http.HttpRequestMessage requestMessage)
 		{
+			var httpRequestMessage = new HttpRequestMessage()
+			{
+				RequestUri = requestMessage.RequestUri
+			};
+			foreach (var header in requestMessage.Headers)
+			{
+				httpRequestMessage.Headers.Add(header.Key, header.Value);
+			}
 			_nativeWebView.ProcessNavigation(httpRequestMessage);
 		}
 

diff --git a/src/Uno.UWP/Generated/3.0.0.0/Windows.Web.Http.Headers/HttpRequestHeaderCollection.cs b/src/Uno.UWP/Generated/3.0.0.0/Windows.Web.Http.Headers/HttpRequestHeaderCollection.cs
@@ -198,7 +198,7 @@ public bool TryAppendWithoutValidation(string name, string value)
 		// Forced skipping of method Windows.Web.Http.Headers.HttpRequestHeaderCollection.First()
 		// Skipping already declared method Windows.Web.Http.Headers.HttpRequestHeaderCollection.ToString()
 		// Processing: System.Collections.Generic.IDictionary<string, string>
-#if __ANDROID__ || __IOS__ || IS_UNIT_TESTS || __WASM__ || __SKIA__ || __NETSTD_REFERENCE__ || __MACOS__
+#if false
 		// DeclaringType: System.Collections.Generic.IDictionary<string, string>
 		[global::Uno.NotImplemented("__ANDROID__", "__IOS__", "IS_UNIT_TESTS", "__WASM__", "__SKIA__", "__NETSTD_REFERENCE__", "__MACOS__")]
 		public void Add(string key, string value)
@@ -228,7 +228,7 @@ public void Add(string key, string value)
 		}
 #endif
 		// Processing: System.Collections.Generic.ICollection<System.Collections.Generic.KeyValuePair<string, string>>
-#if __ANDROID__ || __IOS__ || IS_UNIT_TESTS || __WASM__ || __SKIA__ || __NETSTD_REFERENCE__ || __MACOS__
+#if false
 		// DeclaringType: System.Collections.Generic.ICollection<System.Collections.Generic.KeyValuePair<string, string>>
 		[global::Uno.NotImplemented("__ANDROID__", "__IOS__", "IS_UNIT_TESTS", "__WASM__", "__SKIA__", "__NETSTD_REFERENCE__", "__MACOS__")]
 		public void Add(global::System.Collections.Generic.KeyValuePair<string, string> item)
@@ -255,7 +255,7 @@ public void CopyTo(global::System.Collections.Generic.KeyValuePair<string, strin
 		// Skipping already implement System.Collections.Generic.ICollection<System.Collections.Generic.KeyValuePair<string, string>>.Count
 		// Skipping already implement System.Collections.Generic.ICollection<System.Collections.Generic.KeyValuePair<string, string>>.IsReadOnly
 		// Processing: System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<string, string>>
-#if __ANDROID__ || __IOS__ || IS_UNIT_TESTS || __WASM__ || __SKIA__ || __NETSTD_REFERENCE__ || __MACOS__
+#if false
 		// DeclaringType: System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<string, string>>
 		[global::Uno.NotImplemented("__ANDROID__", "__IOS__", "IS_UNIT_TESTS", "__WASM__", "__SKIA__", "__NETSTD_REFERENCE__", "__MACOS__")]
 		public global::System.Collections.Generic.IEnumerator<global::System.Collections.Generic.KeyValuePair<string, string>> GetEnumerator()
@@ -264,7 +264,7 @@ public void CopyTo(global::System.Collections.Generic.KeyValuePair<string, strin
 		}
 #endif
 		// Processing: System.Collections.IEnumerable
-#if __ANDROID__ || __IOS__ || IS_UNIT_TESTS || __WASM__ || __SKIA__ || __NETSTD_REFERENCE__ || __MACOS__
+#if false
 		// DeclaringType: System.Collections.IEnumerable
 		[global::Uno.NotImplemented("__ANDROID__", "__IOS__", "IS_UNIT_TESTS", "__WASM__", "__SKIA__", "__NETSTD_REFERENCE__", "__MACOS__")]
 		 global::System.Collections.IEnumerator global::System.Collections.IEnumerable.GetEnumerator()

diff --git a/src/Uno.UWP/Web/Http/HttpRequestHeaderCollection.cs b/src/Uno.UWP/Web/Http/HttpRequestHeaderCollection.cs
@@ -162,6 +162,12 @@ public DateTimeOffset? Date
 		}
 	}
 
+	public void Add(string key, string value)
+		=> _dictionary.Add(key, value);
+
+	public void Add(KeyValuePair<string, string> item)
+		=> Add(item.Key, item.Value);
+
 	public bool ContainsKey(string key)
 		=> _dictionary.ContainsKey(key);
 
@@ -214,4 +220,14 @@ public void Clear()
 	public int Count => _dictionary.Count;
 
 	public bool IsReadOnly => false;
+
+	public global::System.Collections.Generic.IEnumerator<global::System.Collections.Generic.KeyValuePair<string, string>> GetEnumerator()
+	{
+		return _dictionary.GetEnumerator();
+	}
+
+	global::System.Collections.IEnumerator global::System.Collections.IEnumerable.GetEnumerator()
+	{
+		return _dictionary.GetEnumerator();
+	}
 }