nettika/mattercontrol
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Receive connection failed details

Browse source
This commit is contained in:
John Lewin 2015-06-17 16:55:49 -07:00
parent 1453a99281
commit 229256729d
3 changed files with 13 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
AboutPage/ContactForm.cs
View file

@ -253,7 +253,7 @@ namespace MatterHackers.MatterControl.ContactForm
submitButton.Visible = false;
postRequest.RequestSucceeded += new EventHandler(onPostRequestSucceeded);
postRequest.RequestFailed += new EventHandler(onPostRequestFailed);
postRequest.RequestFailed += onPostRequestFailed;
postRequest.Request();
}
}
@ -264,7 +264,7 @@ namespace MatterHackers.MatterControl.ContactForm
doneButton.Visible = true;
}
private void onPostRequestFailed(object sender, EventArgs e)
private void onPostRequestFailed(object sender, ResponseEventArgs e)
{
submissionStatus.Text = LocalizedString.Get("Sorry! We weren't able to submit your request.");
doneButton.Visible = true;

4
AboutPage/UpdateControlData.cs
View file

@ -170,7 +170,7 @@ namespace MatterHackers.MatterControl
SetUpdateStatus(UpdateStatusStates.CheckingForUpdate);
RequestLatestVersion request = new RequestLatestVersion();
request.RequestSucceeded += new EventHandler(onVersionRequestSucceeded);
request.RequestFailed += new EventHandler(onVersionRequestFailed);
request.RequestFailed += onVersionRequestFailed;
request.Request();
}
}
@ -243,7 +243,7 @@ namespace MatterHackers.MatterControl
return null;
}
private void onVersionRequestFailed(object sender, EventArgs e)
private void onVersionRequestFailed(object sender, ResponseEventArgs e)
{
SetUpdateStatus(UpdateStatusStates.UpToDate);
}

14
VersionManagement/WebRequestHandler.cs
View file

@ -34,6 +34,11 @@ using System.ComponentModel;
namespace MatterHackers.MatterControl.VersionManagement
{
public class ResponseEventArgs : EventArgs
{
public JsonResponseDictionary ResponseValues { get; set; }
}
public class WebRequestBase
{
protected string uri;
@ -41,7 +46,7 @@ namespace MatterHackers.MatterControl.VersionManagement
public event EventHandler RequestSucceeded;
public event EventHandler RequestFailed;
public event EventHandler<ResponseEventArgs> RequestFailed;
public event EventHandler RequestComplete;
@ -62,11 +67,11 @@ namespace MatterHackers.MatterControl.VersionManagement
}
}
protected void OnRequestFailed()
protected void OnRequestFailed(JsonResponseDictionary responseValues)
{
if (RequestFailed != null)
{
RequestFailed(this, null);
RequestFailed(this, new ResponseEventArgs() { ResponseValues = responseValues });
}
}
@ -121,7 +126,6 @@ namespace MatterHackers.MatterControl.VersionManagement
protected virtual void ProcessResponse(object sender, RunWorkerCompletedEventArgs e)
{
JsonResponseDictionary responseValues = e.Result as JsonResponseDictionary;
if (responseValues != null)
{
string requestSuccessStatus = responseValues.get("Status");
@ -133,7 +137,7 @@ namespace MatterHackers.MatterControl.VersionManagement
else
{
ProcessErrorResponse(responseValues);
OnRequestFailed();
OnRequestFailed(responseValues);
}
OnRequestComplete();