Add proper error message for failed checksum on package download

bloxstraplabs · Jun 30, 2024 · b2cfeeb · b2cfeeb
1 parent 460ff56
commit b2cfeeb
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 6 deletions.
diff --git a/Bloxstrap/App.xaml.cs b/Bloxstrap/App.xaml.cs
@@ -159,7 +159,13 @@ protected override async void OnStartup(StartupEventArgs e)
             if (connectionResult is not null)
             {
                 Logger.WriteException(LOG_IDENT, connectionResult);
-                Frontend.ShowConnectivityDialog("Roblox", Bloxstrap.Resources.Strings.Bootstrapper_Connectivity_Preventing, connectionResult);
+
+                Frontend.ShowConnectivityDialog(
+                    Bloxstrap.Resources.Strings.Dialog_Connectivity_UnableToConnect, 
+                    Bloxstrap.Resources.Strings.Bootstrapper_Connectivity_Preventing, 
+                    connectionResult
+                );
+
                 return;
             }
 

diff --git a/Bloxstrap/Bootstrapper.cs b/Bloxstrap/Bootstrapper.cs
@@ -154,7 +154,7 @@ public async Task Run()
                 else if (ex.GetType() == typeof(AggregateException))
                     ex = ex.InnerException!;
 
-                Frontend.ShowConnectivityDialog("Roblox", message, ex);
+                Frontend.ShowConnectivityDialog(Strings.Dialog_Connectivity_UnableToConnect, message, ex);
 
                 App.Terminate(ErrorCode.ERROR_CANCELLED);
             }
@@ -1461,7 +1461,7 @@ private async Task DownloadPackage(Package package)
                     string hash = MD5Hash.FromStream(fileStream);
 
                     if (hash != package.Signature)
-                        throw new ChecksumFailedException($"Failed to verify download of {packageUrl}\n\nGot signature: {hash}\n\nPackage has been downloaded to {packageLocation}\n\nPlease send the file shown above in a bug report.");
+                        throw new ChecksumFailedException($"Failed to verify download of {packageUrl}\n\nExpected hash: {package.Signature}\nGot hash: {hash}");
 
                     App.Logger.WriteLine(LOG_IDENT, $"Finished downloading! ({totalBytesRead} bytes total)");
                     break;
@@ -1471,7 +1471,17 @@ private async Task DownloadPackage(Package package)
                     App.Logger.WriteLine(LOG_IDENT, $"An exception occurred after downloading {totalBytesRead} bytes. ({i}/{maxTries})");
                     App.Logger.WriteException(LOG_IDENT, ex);
 
-                    if (i >= maxTries || ex.GetType() == typeof(ChecksumFailedException))
+                    if (ex.GetType() == typeof(ChecksumFailedException))
+                    {
+                        Frontend.ShowConnectivityDialog(
+                            Strings.Dialog_Connectivity_UnableToDownload,
+                            String.Format(Strings.Dialog_Connectivity_UnableToDownloadReason, "[https://github.com/pizzaboxer/bloxstrap/wiki/Bloxstrap-is-unable-to-download-Roblox](https://github.com/pizzaboxer/bloxstrap/wiki/Bloxstrap-is-unable-to-download-Roblox)"),
+                            ex
+                        );
+
+                        App.Terminate(ErrorCode.ERROR_CANCELLED);
+                    }
+                    else if (i >= maxTries)
                         throw;
 
                     if (File.Exists(packageLocation))

diff --git a/Bloxstrap/Resources/Strings.Designer.cs b/Bloxstrap/Resources/Strings.Designer.cs
diff --git a/Bloxstrap/Resources/Strings.resx b/Bloxstrap/Resources/Strings.resx
@@ -310,7 +310,7 @@ Click for more information</value>
     <value>Connectivity error</value>
   </data>
   <data name="Dialog.Connectivity.UnableToConnect" xml:space="preserve">
-    <value>Bloxstrap is unable to connect to {0}</value>
+    <value>Bloxstrap is unable to connect to Roblox</value>
   </data>
   <data name="Dialog.Exception.CopyLogContents" xml:space="preserve">
     <value>Copy log contents</value>
@@ -1061,4 +1061,10 @@ Scroll for more languages.</value>
   <data name="Menu.FastFlags.Presets.DisableTerrainTextures.Title" xml:space="preserve">
     <value>Disable terrain textures</value>
   </data>
+  <data name="Dialog.Connectivity.UnableToDownload" xml:space="preserve">
+    <value>Bloxstrap is unable to download Roblox</value>
+  </data>
+  <data name="Dialog.Connectivity.UnableToDownloadReason" xml:space="preserve">
+    <value>Roblox cannot be downloaded at this time. Please read the following help page for more information: {0}</value>
+  </data>
 </root>