Add warning before uploading log

This commit is contained in:
Charles Milette 2018-10-17 13:48:58 -04:00
parent 575e92c18d
commit 5697671199
No known key found for this signature in database
GPG key ID: 1A5AE81377AD973A
5 changed files with 25 additions and 3 deletions

View file

@ -122,7 +122,10 @@ private void btnUploadLog_Click(object sender, EventArgs e)
{
if (!string.IsNullOrEmpty(rtbDebug.Text))
{
UploadRequested?.Invoke(rtbDebug.Text);
Invoke(new Action(() =>
{
UploadRequested?.Invoke(rtbDebug.Text);
}));
}
}

View file

@ -340,7 +340,7 @@
<value>6</value>
</data>
<data name="btnUploadLog.Text" xml:space="preserve">
<value>Upload log</value>
<value>Upload log...</value>
</data>
<data name="&gt;&gt;btnUploadLog.Name" xml:space="preserve">
<value>btnUploadLog</value>

View file

@ -1668,7 +1668,14 @@ private void tsmiShowDebugLog_Click(object sender, EventArgs e)
DebugForm form = DebugForm.GetFormInstance(DebugHelper.Logger);
if (!form.HasUploadRequested)
{
form.UploadRequested += text => UploadManager.UploadText(text);
form.UploadRequested += (text) =>
{
DialogResult result = MessageBox.Show(form, Resources.MainForm_UploadDebugLogWarning, "ShareX", MessageBoxButtons.YesNo, MessageBoxIcon.Warning, MessageBoxDefaultButton.Button1);
if (result == DialogResult.Yes)
{
UploadManager.UploadText(text);
}
};
}
form.ForceActivate();
}

View file

@ -1807,6 +1807,15 @@ public static string MainForm_UpdateWorkflowsMenu_You_can_add_workflows_from_hot
}
}
/// <summary>
/// Looks up a localized string similar to The debug log can contain sensitive information. Are you sure you want to proceed?.
/// </summary>
public static string MainForm_UploadDebugLogWarning {
get {
return ResourceManager.GetString("MainForm_UploadDebugLogWarning", resourceCulture);
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>

View file

@ -991,4 +991,7 @@ Middle click to close</value>
<data name="MustReopenForPersonalFolderChangesToTakeEffect" xml:space="preserve">
<value>You must reopen ShareX for personal folder changes to take effect.</value>
</data>
<data name="MainForm_UploadDebugLogWarning" xml:space="preserve">
<value>The debug log can contain sensitive information. Are you sure you want to proceed?</value>
</data>
</root>