🎨 optimize

Author: jinzaz

src/Avalonia.WebView2.Sample/MainWindow.xaml.cs

@@ -95,11 +95,6 @@ void UrlTextBox_KeyDown(object? sender, KeyEventArgs e)
     void SetTitle(string? browserVersion, Architecture architecture = Unknown)
         => Title.Content = base.Title = GetTitle(browserVersion, architecture);
 
-    void InitializeComponent()
-    {
-        AvaloniaXamlLoader.Load(this);
-    }
-
     //void Environment_ProcessInfosChanged(object? sender, object e)
     //{
     //    var processInfos = Environment!.GetProcessInfos();

src/Avalonia.WebView2.Sample/WebView2Compat.xaml.cs

@@ -43,11 +43,6 @@ void WebView2_DOMContentLoaded(object? sender, CoreWebView2DOMContentLoadedEvent
     }
 #endif
 
-    private void InitializeComponent()
-    {
-        AvaloniaXamlLoader.Load(this);
-    }
-
     IEnumerable<KeyValuePair<(StorageItemType type, string key), StorageItemValue>>? IStorageService.GetStorages(string requestUri)
     {
         var result = SampleHelper.GetStorages(requestUri);

src/Avalonia.WebView2/Platforms/Droid/Controls/WebView2.cs

@@ -254,23 +254,28 @@ public override bool ShouldOverrideUrlLoading(AWebView? view, string? url)
         public override void OnPageStarted(AWebView? view, string? url, Bitmap? favicon)
         {
             var handler = Handler;
-            if (!string.IsNullOrWhiteSpace(url))
-            {
-                handler.VirtualView.SyncPlatformCookiesToWebView2(url).FireAndForget();
-            }
 
-            if (view != null)
+            if (handler != null)
             {
                 if (!string.IsNullOrWhiteSpace(url))
                 {
-                    var js = HandlerStorageServiceGenerateJSString(handler.VirtualView.StorageService, url);
-                    if (js != null)
+                    handler.VirtualView.SyncPlatformCookiesToWebView2(url).FireAndForget();
+                }
+
+                if (view != null)
+                {
+                    if (!string.IsNullOrWhiteSpace(url))
                     {
-                        view.EvaluateJavascript(js, null);
+                        var js = HandlerStorageServiceGenerateJSString(handler.VirtualView.StorageService, url);
+                        if (js != null)
+                        {
+                            view.EvaluateJavascript(js, null);
+                        }
                     }
                 }
             }
 
+
             base.OnPageStarted(view, url, favicon);
         }
 

src/Avalonia.WebView2/Platforms/iOS/Controls/WebView2.Cookie.cs

@@ -161,7 +161,7 @@ async Task<List<NSHttpCookie>> GetCookiesFromPlatformStore(string url)
     {
         NSHttpCookie[]? _initialCookiesLoaded = null;
 
-        if (OperatingSystem.IsIOSVersionAtLeast(11))
+        if (OperatingSystem.IsIOSVersionAtLeast(11) && PlatformWebView != null)
         {
             _initialCookiesLoaded = await PlatformWebView.Configuration.WebsiteDataStore.HttpCookieStore.GetAllCookiesAsync();
         }
@@ -195,6 +195,9 @@ async Task<List<NSHttpCookie>> GetCookiesFromPlatformStore(string url)
 
     async Task SetCookie(List<Cookie> cookies)
     {
+        if (PlatformWebView is null)
+            return;
+
         if (OperatingSystem.IsIOSVersionAtLeast(11))
         {
             foreach (var cookie in cookies)
@@ -215,6 +218,10 @@ async Task SetCookie(List<Cookie> cookies)
 
     async Task DeleteCookies(List<NSHttpCookie> cookies)
     {
+        if (PlatformWebView is null)
+            return;
+
+
         if (OperatingSystem.IsIOSVersionAtLeast(11))
         {
             foreach (var cookie in cookies)