Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Handle more exceptions as failed external operation #9094

Merged
merged 1 commit into from
Apr 21, 2021
Merged

Handle more exceptions as failed external operation #9094

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
19 changes: 14 additions & 5 deletions GitUI/NBugReports/BugReportInvoker.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
#nullable enable

using System;
using System.ComponentModel;
using System.Diagnostics;
using System.IO;
using System.Security;
using System.Text;
using System.Windows.Forms;
using BugReporter;
Expand Down Expand Up @@ -79,7 +82,13 @@ public static void Report(Exception exception, bool isTerminating)
}

bool isUserExternalOperation = exception is UserExternalOperationException;
bool isExternalOperation = exception is ExternalOperationException;
bool isExternalOperation = exception is ExternalOperationException
or IOException
or SecurityException
or FileNotFoundException
or DirectoryNotFoundException
or PathTooLongException
or Win32Exception;

StringBuilder text = new();
string rootError = Append(text, exception);
Expand Down Expand Up @@ -111,7 +120,7 @@ public static void Report(Exception exception, bool isTerminating)
taskDialogCommandLink.Click += (s, e) =>
{
taskDialog.Close();
ShowNBug(OwnerForm, exception, isTerminating);
ShowNBug(OwnerForm, exception, isExternalOperation, isTerminating);
};
taskDialog.Controls.Add(taskDialogCommandLink);

Expand All @@ -134,13 +143,13 @@ void AddIgnoreOrCloseButton()
}
}

private static void ShowNBug(IWin32Window? owner, Exception exception, bool isTerminating)
private static void ShowNBug(IWin32Window? owner, Exception exception, bool isExternalOperation, bool isTerminating)
{
using BugReportForm form = new();
DialogResult result = form.ShowDialog(owner, new SerializableException(exception),
UserEnvironmentInformation.GetInformation(),
canIgnore: !isTerminating,
showIgnore: exception is ExternalOperationException,
showIgnore: isExternalOperation,
focusDetails: exception is UserExternalOperationException);
if (isTerminating || result == DialogResult.Abort)
{
Expand All @@ -150,7 +159,7 @@ private static void ShowNBug(IWin32Window? owner, Exception exception, bool isTe

private static string Base64Encode(string plainText)
{
var plainTextBytes = Encoding.UTF8.GetBytes(plainText);
byte[] plainTextBytes = Encoding.UTF8.GetBytes(plainText);
return Convert.ToBase64String(plainTextBytes);
}
}
Expand Down