resolve unreported editor crash on null update url

Author: pandinocoder

Intersect.Editor/Forms/frmUpdate.cs

@@ -4,6 +4,7 @@
 using Intersect.Editor.Core;
 using Intersect.Editor.General;
 using Intersect.Editor.Localization;
+using Intersect.Framework;
 using Intersect.Framework.Core.AssetManagement;
 using Intersect.Framework.Utilities;
 using Intersect.Web;
@@ -22,7 +23,7 @@ public partial class FrmUpdate : Form
     private long _nextUpdateAttempt;
     private Task? _pendingManifestTask;
     private TokenResponse? _tokenResponse;
-    private Updater _updater;
+    private Updater? _updater;
     private UpdaterStatus? _updaterStatus;
 
     public FrmUpdate()
@@ -34,22 +35,28 @@ public FrmUpdate()
 
     private void frmUpdate_Load(object sender, EventArgs e)
     {
-        AppDomain.CurrentDomain.UnhandledException += Program.CurrentDomain_UnhandledException;
         try
         {
             Strings.Load();
         }
         catch (Exception exception)
         {
-            Intersect.Core.ApplicationContext.Context.Value?.Logger.LogError(exception, "Error loading strings");
+            ApplicationContext.Context.Value?.Logger.LogError(exception, "Error loading strings");
             throw;
         }
+
         GameContentManager.CheckForResources();
         Database.LoadOptions();
         InitLocalization();
 
+
+        if (ClientConfiguration.Instance.UpdateUrl is not { } updateUrl || string.IsNullOrWhiteSpace(updateUrl))
+        {
+            return;
+        }
+
         _updater = new Updater(
-            ClientConfiguration.Instance.UpdateUrl,
+            updateUrl,
             "editor/update.json",
             "version.editor.json",
             7
@@ -81,39 +88,48 @@ private void InitLocalization()
         lblVersion.Text = Strings.Login.version.ToString(Application.ProductVersion);
         lblVersion.Location = new System.Drawing.Point(
             (lblVersion.Parent?.ClientRectangle.Right - (lblVersion.Parent?.Padding.Right + lblVersion.Width + 4)) ?? 0,
-            (lblVersion.Parent?.ClientRectangle.Bottom - (lblVersion.Parent?.Padding.Bottom + lblVersion.Height + 4)) ?? 0
+            (lblVersion.Parent?.ClientRectangle.Bottom - (lblVersion.Parent?.Padding.Bottom + lblVersion.Height + 4)) ??
+            0
         );
         lblStatus.Text = Strings.Update.Checking;
     }
 
     protected override void OnClosed(EventArgs e)
     {
-        _updater.Stop();
+        _updater?.Stop();
         base.OnClosed(e);
         Application.Exit();
     }
 
     protected override void OnShown(EventArgs e)
     {
         base.OnShown(e);
-        tmrUpdate.Enabled = true;
+
+        if (_updater is null)
+        {
+            SwitchToLogin(requiresAuthentication: false, deferHide: true);
+        }
+        else
+        {
+            tmrUpdate.Enabled = true;
+        }
     }
 
-    private void SwitchToLogin(bool requiresAuthentication)
+    private void SwitchToLogin(bool requiresAuthentication, bool deferHide = false)
     {
         lblFiles.Hide();
         lblSize.Hide();
         tmrUpdate.Enabled = false;
 
         var loginForm = Globals.LoginForm ??= new FrmLogin(requiresAuthentication);
 
-        _pendingManifestTask = default;
+        _pendingManifestTask = null;
 
         try
         {
-            Hide();
-
             loginForm.Show();
+
+            Hide();
         }
         catch
         {
@@ -128,20 +144,23 @@ private void CheckForUpdate()
     {
         lock (_manifestTaskLock)
         {
-            if (_pendingManifestTask != default)
+            if (_pendingManifestTask != null)
             {
                 return;
             }
 
-            _pendingManifestTask = Task.Run(() =>
-            {
-                _updaterStatus = _updater.TryGetManifest(out var manifest, force: _tokenResponse != default);
-                if (_updaterStatus == UpdaterStatus.Offline)
+            _pendingManifestTask = Task.Run(
+                () =>
                 {
-                    _nextUpdateAttempt = Environment.TickCount64 + 10_000;
+                    _updaterStatus = _updater?.TryGetManifest(out _, force: _tokenResponse != null);
+                    if (_updaterStatus == UpdaterStatus.Offline)
+                    {
+                        _nextUpdateAttempt = Environment.TickCount64 + 10_000;
+                    }
+
+                    _pendingManifestTask = null;
                 }
-                _pendingManifestTask = default;
-            });
+            );
         }
     }
 
@@ -150,9 +169,9 @@ internal void ShowWithToken(TokenResponse tokenResponse)
         _tokenResponse = tokenResponse ?? throw new ArgumentNullException(nameof(tokenResponse));
 
         Preferences.SavePreference(nameof(TokenResponse), JsonConvert.SerializeObject(_tokenResponse));
-        _updater.SetAuthorizationData(_tokenResponse);
+        _updater?.SetAuthorizationData(_tokenResponse);
 
-        _updaterStatus = default;
+        _updaterStatus = null;
 
         lblFiles.Show();
         lblSize.Show();
@@ -161,96 +180,96 @@ internal void ShowWithToken(TokenResponse tokenResponse)
         Show();
 
         Globals.LoginForm?.Close();
-        Globals.LoginForm = default;
+        Globals.LoginForm = null;
     }
 
-            private void tmrUpdate_Tick(object sender, EventArgs e)
+    private void tmrUpdate_Tick(object sender, EventArgs e)
+    {
+        if (_updater == null)
         {
-            if (_updater == null)
-            {
-                return;
-            }
+            return;
+        }
 
-            switch (_updaterStatus)
-            {
-                case UpdaterStatus.NoUpdateNeeded:
-                    SwitchToLogin(false);
-                    return;
-                case UpdaterStatus.NeedsAuthentication:
-                    SwitchToLogin(true);
-                    return;
-                case UpdaterStatus.Ready:
-                    _nextUpdateAttempt = long.MinValue;
-                    _updaterStatus = default;
-                    _updater.Start();
-                    break;
-                case UpdaterStatus.Offline:
-                    break;
-                default:
-                    break;
-            }
+        switch (_updaterStatus)
+        {
+            case UpdaterStatus.NoUpdateNeeded:
+                SwitchToLogin(false);
+                return;
+            case UpdaterStatus.NeedsAuthentication:
+                SwitchToLogin(true);
+                return;
+            case UpdaterStatus.Ready:
+                _nextUpdateAttempt = long.MinValue;
+                _updaterStatus = null;
+                _updater.Start();
+                break;
+            case UpdaterStatus.Offline:
+                break;
+            default:
+                throw Exceptions.UnreachableInvalidEnum(_updaterStatus ?? default);
+        }
 
-            if (_nextUpdateAttempt != long.MinValue)
+        if (_nextUpdateAttempt != long.MinValue)
+        {
+            var now = Environment.TickCount64;
+            if (now < _nextUpdateAttempt)
             {
-                var now = Environment.TickCount64;
-                if (now < _nextUpdateAttempt)
-                {
-                    return;
-                }
-
-                _nextUpdateAttempt = now + 10_000;
-                CheckForUpdate();
                 return;
             }
 
-            progressBar.Style = _updater.Status == UpdateStatus.DownloadingManifest
-                ? ProgressBarStyle.Marquee
-                : ProgressBarStyle.Continuous;
+            _nextUpdateAttempt = now + 10_000;
+            CheckForUpdate();
+            return;
+        }
 
-            switch (_updater.Status)
-            {
-                case UpdateStatus.DownloadingManifest:
-                    lblStatus.Text = Strings.Update.Checking;
-                    break;
-                case UpdateStatus.UpdateInProgress:
-                    lblFiles.Show();
-                    lblSize.Show();
-                    lblFiles.Text = Strings.Update.Files.ToString(_updater.FilesRemaining);
-                    lblSize.Text = Strings.Update.Size.ToString(Updater.GetHumanReadableFileSize(_updater.SizeRemaining));
-                    lblStatus.Text = Strings.Update.Updating.ToString((int)_updater.Progress);
-                    progressBar.Value = Math.Min(100, (int)_updater.Progress);
-                    break;
-                case UpdateStatus.Restart:
-                    lblFiles.Hide();
-                    lblSize.Hide();
-                    progressBar.Value = 100;
-                    lblStatus.Text = Strings.Update.Restart.ToString();
-                    tmrUpdate.Enabled = false;
-
-                    if (!ProcessHelper.TryRelaunch())
-                    {
-                        ApplicationContext.CurrentContext.Logger.LogWarning("Failed to restart automatically");
-                    }
+        progressBar.Style = _updater.Status == UpdateStatus.DownloadingManifest
+            ? ProgressBarStyle.Marquee
+            : ProgressBarStyle.Continuous;
 
-                    this.Close();
-
-                    break;
-                case UpdateStatus.UpdateCompleted:
-                    progressBar.Value = 100;
-                    lblStatus.Text = Strings.Update.Done;
-                    SwitchToLogin(false);
-                    break;
-                case UpdateStatus.Error:
-                    lblFiles.Hide();
-                    lblSize.Hide();
-                    progressBar.Value = 100;
-                    lblStatus.Text = Strings.Update.Error.ToString(_updater.Exception?.Message ?? "");
-                    break;
-                case UpdateStatus.None:
-                    SwitchToLogin(false);
-                    break;
-                default:
-                    throw new ArgumentOutOfRangeException();
-            }
+        switch (_updater.Status)
+        {
+            case UpdateStatus.DownloadingManifest:
+                lblStatus.Text = Strings.Update.Checking;
+                break;
+            case UpdateStatus.UpdateInProgress:
+                lblFiles.Show();
+                lblSize.Show();
+                lblFiles.Text = Strings.Update.Files.ToString(_updater.FilesRemaining);
+                lblSize.Text = Strings.Update.Size.ToString(Updater.GetHumanReadableFileSize(_updater.SizeRemaining));
+                lblStatus.Text = Strings.Update.Updating.ToString((int)_updater.Progress);
+                progressBar.Value = Math.Min(100, (int)_updater.Progress);
+                break;
+            case UpdateStatus.Restart:
+                lblFiles.Hide();
+                lblSize.Hide();
+                progressBar.Value = 100;
+                lblStatus.Text = Strings.Update.Restart.ToString();
+                tmrUpdate.Enabled = false;
+
+                if (!ProcessHelper.TryRelaunch())
+                {
+                    ApplicationContext.CurrentContext.Logger.LogWarning("Failed to restart automatically");
+                }
+
+                this.Close();
+
+                break;
+            case UpdateStatus.UpdateCompleted:
+                progressBar.Value = 100;
+                lblStatus.Text = Strings.Update.Done;
+                SwitchToLogin(false);
+                break;
+            case UpdateStatus.Error:
+                lblFiles.Hide();
+                lblSize.Hide();
+                progressBar.Value = 100;
+                lblStatus.Text = Strings.Update.Error.ToString(_updater.Exception?.Message ?? "");
+                break;
+            case UpdateStatus.None:
+                SwitchToLogin(false);
+                break;
+            default:
+                throw new ArgumentOutOfRangeException();
         }
+    }
 }