Changeset 1408

Timestamp:

12/22/2009 6:20:10 AM (3 years ago)

Author:

lowjoel

Message:

If the HTTP error code is not 200 OK we will check for an Error root element and use that as error text.

Location:

branches/eraser6/BlackBox/Eraser

Files:

• BlackBoxUploadForm.Designer.cs (modified) (3 diffs)
• BlackBoxUploadForm.cs (modified) (4 diffs)

branches/eraser6/BlackBox/Eraser/BlackBoxUploadForm.Designer.cs

@@ -84 +84 @@
             // ProgressPb
             // 
-            this.ProgressPb.Location = new System.Drawing.Point(13, 73);
+            this.ProgressPb.Location = new System.Drawing.Point(13, 70);
             this.ProgressPb.Name = "ProgressPb";
             this.ProgressPb.Size = new System.Drawing.Size(321, 17);
@@ -100 +100 @@
             // 
             this.ProgressLbl.AutoSize = true;
-            this.ProgressLbl.Location = new System.Drawing.Point(11, 55);
+            this.ProgressLbl.Location = new System.Drawing.Point(11, 52);
             this.ProgressLbl.Name = "ProgressLbl";
             this.ProgressLbl.Size = new System.Drawing.Size(126, 15);
@@ -121 +121 @@
             this.MinimizeBox = false;
             this.Name = "BlackBoxUploadForm";
+            this.ShowInTaskbar = false;
             this.Text = "Eraser Crash Assistant";
+            this.TopMost = true;
             this.ButtonsPnl.ResumeLayout(false);
             this.ResumeLayout(false);

branches/eraser6/BlackBox/Eraser/BlackBoxUploadForm.cs

@@ -105 +105 @@
             if (e.Error != null)
                 MessageBox.Show(e.Error.Message);
+            ProgressLbl.Text = S._("Reports submitted successfully.");
             CancelBtn.Text = S._("Close");
         }
@@ -161 +162 @@
             HttpWebResponse response = reportRequest.GetResponse() as HttpWebResponse;
             if (response.StatusCode != HttpStatusCode.OK)
+            {
+                using (Stream responseStream = response.GetResponseStream())
+                {
+                    try
+                    {
+                        XmlReader reader = XmlReader.Create(responseStream);
+                        reader.ReadToFollowing("error");
+                        throw new InvalidDataException(S._("The server encountered a problem " +
+                            "while processing the request: {0}", reader.ReadString()));
+                    }
+                    catch (XmlException)
+                    {
+                    }
+                }
+
                 throw new InvalidDataException(response.StatusDescription);
+            }
 
             using (Stream responseStream = response.GetResponseStream())
-            using (StreamReader rdr = new StreamReader(responseStream))
-            {
-                string str = rdr.ReadToEnd();
-                XmlReader reader = XmlReader.Create(new MemoryStream(Encoding.UTF8.GetBytes(str)));
+            {
+                XmlReader reader = XmlReader.Create(responseStream);
                 reader.ReadToFollowing("crashReport");
                 string reportStatus = reader.GetAttribute("status");
@@ -252 +267 @@
                 HttpWebResponse response = reportRequest.GetResponse() as HttpWebResponse;
                 if (response.StatusCode != HttpStatusCode.OK)
+                {
+                    using (Stream responseStream = response.GetResponseStream())
+                    {
+                        try
+                        {
+                            XmlReader reader = XmlReader.Create(responseStream);
+                            reader.ReadToFollowing("error");
+                            throw new InvalidDataException(S._("The server encountered a problem " +
+                                "while processing the request: {0}", reader.ReadString()));
+                        }
+                        catch (XmlException)
+                        {
+                        }
+                    }
+
                     throw new InvalidDataException(response.StatusDescription);
+                }
             }
         }
@@ -284 +315 @@
         /// </summary>
         private static readonly Uri BlackBoxServer =
-            new Uri("http://eraser.joelsplace.dyndns.org/BlackBox/upload.php");
+            new Uri("http://eraser.heidi.ie/BlackBox/upload.php");
 
         /// <summary>