Changeset 1409

Timestamp:

12/22/2009 10:38:31 AM (3 years ago)

Author:

lowjoel

Message:

-Display a proper error message box when errors occur in the worker thread
-Instead of checking the response code when getting the web response, we handle errors in exception handlers (WebException? is thrown)

File:

• branches/eraser6/BlackBox/Eraser/BlackBoxUploadForm.cs (modified) (5 diffs)

branches/eraser6/BlackBox/Eraser/BlackBoxUploadForm.cs

@@ -103 +103 @@
         private void UploadWorker_RunWorkerCompleted(object sender, RunWorkerCompletedEventArgs e)
         {
-            if (e.Error != null)
-                MessageBox.Show(e.Error.Message);
-            ProgressLbl.Text = S._("Reports submitted successfully.");
-            CancelBtn.Text = S._("Close");
+            if (e.Error == null)
+            {
+                ProgressLbl.Text = S._("Reports submitted successfully.");
+                CancelBtn.Text = S._("Close");
+            }
+            else
+            {
+                MessageBox.Show(this, e.Error.Message,
+                    S._("Eraser"), MessageBoxButtons.OK, MessageBoxIcon.Error,
+                    MessageBoxDefaultButton.Button1, S.IsRightToLeft(this) ?
+                        MessageBoxOptions.RtlReading : 0);
+                Close();
+            }
         }
 
@@ -160 +169 @@
             }
 
-            HttpWebResponse response = reportRequest.GetResponse() as HttpWebResponse;
-            if (response.StatusCode != HttpStatusCode.OK)
-            {
+            try
+            {
+                HttpWebResponse response = reportRequest.GetResponse() as HttpWebResponse;
                 using (Stream responseStream = response.GetResponseStream())
+                {
+                    XmlReader reader = XmlReader.Create(responseStream);
+                    reader.ReadToFollowing("crashReport");
+                    string reportStatus = reader.GetAttribute("status");
+                    switch (reportStatus)
+                    {
+                        case "exists":
+                            return false;
+
+                        case "new":
+                            return true;
+
+                        default:
+                            throw new InvalidDataException(S._("Unknown crash report server response."));
+                    }
+                }
+            }
+            catch (WebException e)
+            {
+                using (Stream responseStream = e.Response.GetResponseStream())
                 {
                     try
@@ -177 +206 @@
                 }
 
-                throw new InvalidDataException(response.StatusDescription);
-            }
-
-            using (Stream responseStream = response.GetResponseStream())
-            {
-                XmlReader reader = XmlReader.Create(responseStream);
-                reader.ReadToFollowing("crashReport");
-                string reportStatus = reader.GetAttribute("status");
-                switch (reportStatus)
-                {
-                    case "exists":
-                        return false;
-
-                    case "new":
-                        return true;
-
-                    default:
-                        throw new InvalidDataException(S._("Unknown crash report server response."));
-                }
+                throw new InvalidDataException(((HttpWebResponse)e.Response).StatusDescription);
             }
         }
@@ -265 +276 @@
                 }
 
-                HttpWebResponse response = reportRequest.GetResponse() as HttpWebResponse;
-                if (response.StatusCode != HttpStatusCode.OK)
-                {
-                    using (Stream responseStream = response.GetResponseStream())
+                try
+                {
+                    reportRequest.GetResponse();
+                }
+                catch (WebException e)
+                {
+                    using (Stream responseStream = e.Response.GetResponseStream())
                     {
                         try
@@ -282 +296 @@
                     }
 
-                    throw new InvalidDataException(response.StatusDescription);
+                    throw new InvalidDataException(((HttpWebResponse)e.Response).StatusDescription);
                 }
             }