Eilon · Eilon · Oct 29, 2024 · Oct 28, 2024
diff --git a/HybridWebView/HybridWebView.cs b/HybridWebView/HybridWebView.cs
@@ -62,6 +62,12 @@ protected override async void OnHandlerChanged()
 
             await InitializeHybridWebView();
 
+            // HybridWebViewInitialized assumes Handler != null
+            if (Handler == null)
+            {
+                return;
+            }
+
             HybridWebViewInitialized?.Invoke(this, new HybridWebViewInitializedEventArgs()
             {
 #if ANDROID || IOS || MACCATALYST || WINDOWS

diff --git a/HybridWebView/Platforms/iOS/HybridWebViewHandler.iOS.cs b/HybridWebView/Platforms/iOS/HybridWebViewHandler.iOS.cs
            {
                string contentType;

                string fullUrl = url;
                url = QueryStringHelper.RemovePossibleQueryString(url);

                if (new Uri(url) is Uri uri && HybridWebView.AppOriginUri.IsBaseOf(uri))
                    // Check to see if the request is a proxy request.
                    if (relativePath == HybridWebView.ProxyRequestPath)
                    {
                        var args = new HybridWebViewProxyEventArgs(fullUrl);

                        await hwv.OnProxyRequestMessage(args);

diff --git a/HybridWebView/Platforms/MacCatalyst/HybridWebViewHandler.MacCatalyst.cs b/HybridWebView/Platforms/MacCatalyst/HybridWebViewHandler.MacCatalyst.cs
            {
                string contentType;

                string fullUrl = url;
                url = QueryStringHelper.RemovePossibleQueryString(url);

                if (new Uri(url) is Uri uri && HybridWebView.AppOriginUri.IsBaseOf(uri))
                    // Check to see if the request is a proxy request.
                    if (relativePath == HybridWebView.ProxyRequestPath)
                    {
                        var args = new HybridWebViewProxyEventArgs(fullUrl);

                        await hwv.OnProxyRequestMessage(args);

diff --git a/HybridWebView/Platforms/Android/AndroidHybridWebViewClient.cs b/HybridWebView/Platforms/Android/AndroidHybridWebViewClient.cs
                // Check to see if the request is a proxy request.
                if (relativePath == HybridWebView.ProxyRequestPath)
                {
                    var args = new HybridWebViewProxyEventArgs(fullUrl);

                    // TODO: Don't block async. Consider making this an async call, and then calling DidFinish when done
                    webView.OnProxyRequestMessage(args).Wait();
	{
	string contentType;

	string fullUrl = url;
Check warning on line 100 in HybridWebView/Platforms/iOS/HybridWebViewHandler.iOS.cs GitHub Actions / call-build-workflow / Build (windows-latest) `Converting null literal or possible null value to non-nullable type.` Check warning on line 100 in HybridWebView/Platforms/iOS/HybridWebViewHandler.iOS.cs GitHub Actions / call-build-workflow / Build (macos-14) `Converting null literal or possible null value to non-nullable type.`
	url = QueryStringHelper.RemovePossibleQueryString(url);

	if (new Uri(url) is Uri uri && HybridWebView.AppOriginUri.IsBaseOf(uri))
	// Check to see if the request is a proxy request.
	if (relativePath == HybridWebView.ProxyRequestPath)
	{
	var args = new HybridWebViewProxyEventArgs(fullUrl);
Check warning on line 133 in HybridWebView/Platforms/iOS/HybridWebViewHandler.iOS.cs GitHub Actions / call-build-workflow / Build (windows-latest) `Possible null reference argument for parameter 'fullUrl' in 'HybridWebViewProxyEventArgs.HybridWebViewProxyEventArgs(string fullUrl)'.` Check warning on line 133 in HybridWebView/Platforms/iOS/HybridWebViewHandler.iOS.cs GitHub Actions / call-build-workflow / Build (macos-14) `Possible null reference argument for parameter 'fullUrl' in 'HybridWebViewProxyEventArgs.HybridWebViewProxyEventArgs(string fullUrl)'.`

	await hwv.OnProxyRequestMessage(args);
	{
	string contentType;

	string fullUrl = url;
Check warning on line 99 in HybridWebView/Platforms/MacCatalyst/HybridWebViewHandler.MacCatalyst.cs GitHub Actions / call-build-workflow / Build (windows-latest) `Converting null literal or possible null value to non-nullable type.` Check warning on line 99 in HybridWebView/Platforms/MacCatalyst/HybridWebViewHandler.MacCatalyst.cs GitHub Actions / call-build-workflow / Build (macos-14) `Converting null literal or possible null value to non-nullable type.`
	url = QueryStringHelper.RemovePossibleQueryString(url);

	if (new Uri(url) is Uri uri && HybridWebView.AppOriginUri.IsBaseOf(uri))
	// Check to see if the request is a proxy request.
	if (relativePath == HybridWebView.ProxyRequestPath)
	{
	var args = new HybridWebViewProxyEventArgs(fullUrl);
Check warning on line 132 in HybridWebView/Platforms/MacCatalyst/HybridWebViewHandler.MacCatalyst.cs GitHub Actions / call-build-workflow / Build (windows-latest) `Possible null reference argument for parameter 'fullUrl' in 'HybridWebViewProxyEventArgs.HybridWebViewProxyEventArgs(string fullUrl)'.` Check warning on line 132 in HybridWebView/Platforms/MacCatalyst/HybridWebViewHandler.MacCatalyst.cs GitHub Actions / call-build-workflow / Build (macos-14) `Possible null reference argument for parameter 'fullUrl' in 'HybridWebViewProxyEventArgs.HybridWebViewProxyEventArgs(string fullUrl)'.`

	await hwv.OnProxyRequestMessage(args);