Minor fixes

Eilon · Aug 8, 2024 · 7967e0d · 7967e0d
1 parent b9c138d
commit 7967e0d
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/HybridWebView/PathUtils.cs b/HybridWebView/PathUtils.cs
@@ -12,7 +12,7 @@ public static string NormalizePath(string filename) =>
                 .Replace('\\', Path.DirectorySeparatorChar)
                 .Replace('/', Path.DirectorySeparatorChar);
 
-        public static void GetRelativePathAndContentType(Uri appOriginUri, Uri requestUri, string originalUrl, string? mainFileName, out string? relativePath, out string contentType, out string fullUrl)
+        public static void GetRelativePathAndContentType(Uri appOriginUri, Uri requestUri, string originalUrl, string? mainFileName, out string relativePath, out string contentType, out string fullUrl)
         {
             relativePath = appOriginUri.MakeRelativeUri(requestUri).ToString().Replace('/', '\\');
             fullUrl = originalUrl;

diff --git a/HybridWebView/Platforms/Android/AndroidHybridWebViewClient.cs b/HybridWebView/Platforms/Android/AndroidHybridWebViewClient.cs
@@ -24,7 +24,7 @@ public AndroidHybridWebViewClient(HybridWebViewHandler handler) : base(handler)
 
             if (!string.IsNullOrEmpty(originalUrl) && new Uri(requestUri) is Uri uri && HybridWebView.AppOriginUri.IsBaseOf(uri))
             {
-                PathUtils.GetRelativePathAndContentType(HybridWebView.AppOriginUri, uri, originalUrl, webView.MainFile, out string? relativePath, out string contentType, out string fullUrl);
+                PathUtils.GetRelativePathAndContentType(HybridWebView.AppOriginUri, uri, originalUrl, webView.MainFile, out string relativePath, out string contentType, out string fullUrl);
 
                 Stream? contentStream = null;
                 IDictionary<string, string>? customHeaders = null;

diff --git a/HybridWebView/Platforms/MacCatalyst/HybridWebViewHandler.MacCatalyst.cs b/HybridWebView/Platforms/MacCatalyst/HybridWebViewHandler.MacCatalyst.cs
@@ -122,7 +122,7 @@ public async void StartUrlSchemeTask(WKWebView webView, IWKUrlSchemeTask urlSche
                 if (!string.IsNullOrEmpty(originalUrl) && new Uri(url) is Uri uri && HybridWebView.AppOriginUri.IsBaseOf(uri))
                 {
                     var hwv = (HybridWebView)_webViewHandler.VirtualView;
-                    PathUtils.GetRelativePathAndContentType(HybridWebView.AppOriginUri, uri, originalUrl, hwv.MainFile, out string? relativePath, out string contentType, out string fullUrl);
+                    PathUtils.GetRelativePathAndContentType(HybridWebView.AppOriginUri, uri, originalUrl, hwv.MainFile, out string relativePath, out string contentType, out string fullUrl);
 
                     Stream? contentStream = null;
                     IDictionary<string, string>? customHeaders = null;
@@ -153,8 +153,8 @@ public async void StartUrlSchemeTask(WKWebView webView, IWKUrlSchemeTask urlSche
                         return (ms.ToArray(), contentType, StatusCode: 200, CustomHeaders: customHeaders);
                     }
 
-                    var bundleRootDir = Path.Combine(NSBundle.MainBundle.ResourcePath, hwv.HybridAssetRoot!);
-                    var assetPath = Path.Combine(bundleRootDir, relativePath);
+                    string bundleRootDir = Path.Combine(NSBundle.MainBundle.ResourcePath, hwv.HybridAssetRoot ?? "");
+                    string assetPath = Path.Combine(bundleRootDir, relativePath);
 
                     if (File.Exists(assetPath))
                     {

diff --git a/HybridWebView/Platforms/Windows/HybridWebView.Windows.cs b/HybridWebView/Platforms/Windows/HybridWebView.Windows.cs
@@ -51,7 +51,7 @@ private async void CoreWebView2_WebResourceRequested(CoreWebView2 sender, CoreWe
 
             if (new Uri(requestUri) is Uri uri && AppOriginUri.IsBaseOf(uri))
             {
-                PathUtils.GetRelativePathAndContentType(HybridWebView.AppOriginUri, uri, eventArgs.Request.Uri, MainFile, out string? relativePath, out string contentType, out string fullUrl);
+                PathUtils.GetRelativePathAndContentType(HybridWebView.AppOriginUri, uri, eventArgs.Request.Uri, MainFile, out string relativePath, out string contentType, out string fullUrl);
 
                 Stream? contentStream = null;
                 IDictionary<string, string>? customHeaders = null;

diff --git a/HybridWebView/Platforms/iOS/HybridWebViewHandler.iOS.cs b/HybridWebView/Platforms/iOS/HybridWebViewHandler.iOS.cs
@@ -123,7 +123,7 @@ public async void StartUrlSchemeTask(WKWebView webView, IWKUrlSchemeTask urlSche
                 if (!string.IsNullOrEmpty(originalUrl) && new Uri(url) is Uri uri && HybridWebView.AppOriginUri.IsBaseOf(uri))
                 {
                     var hwv = (HybridWebView)_webViewHandler.VirtualView;
-                    PathUtils.GetRelativePathAndContentType(HybridWebView.AppOriginUri, uri, originalUrl, hwv.MainFile, out string? relativePath, out string contentType, out string fullUrl);
+                    PathUtils.GetRelativePathAndContentType(HybridWebView.AppOriginUri, uri, originalUrl, hwv.MainFile, out string relativePath, out string contentType, out string fullUrl);
 
                     Stream? contentStream = null;
                     IDictionary<string, string>? customHeaders = null;
@@ -155,8 +155,8 @@ public async void StartUrlSchemeTask(WKWebView webView, IWKUrlSchemeTask urlSche
                         return (ms.ToArray(), contentType, StatusCode: 200, CustomHeaders: customHeaders);
                     }
 
-                    var bundleRootDir = Path.Combine(NSBundle.MainBundle.ResourcePath, hwv.HybridAssetRoot!);
-                    var assetPath = Path.Combine(bundleRootDir, relativePath);
+                    string bundleRootDir = Path.Combine(NSBundle.MainBundle.ResourcePath, hwv.HybridAssetRoot ?? "");
+                    string assetPath = Path.Combine(bundleRootDir, relativePath);
 
                     if (File.Exists(assetPath))
                     {