From 48aeaf6548244adcd46b17996b327779de14c8ed Mon Sep 17 00:00:00 2001
From: Dmitry Makarenko <kryksyh@gmail.com>
Date: Tue, 15 Oct 2024 13:56:20 +0300
Subject: [PATCH] Show crash report sending failure unconditionally

(cherry picked from commit 36b58b982849481e860eb9f4d6f73e087d5e2e10)
---
 crashreporter/CrashReportApp.cpp | 17 ++++++-----------
 crashreporter/CrashReportApp.h   |  1 -
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/crashreporter/CrashReportApp.cpp b/crashreporter/CrashReportApp.cpp
index 2e05094b8e5f..0e877ad36d19 100644
--- a/crashreporter/CrashReportApp.cpp
+++ b/crashreporter/CrashReportApp.cpp
@@ -74,7 +74,7 @@ namespace
         );
 
         if(result != google_breakpad::RESULT_SUCCEEDED)
-            errorString = wxString::Format("SendMinidump filed with result: %s", StringifyReportResult(result));
+            errorString = wxString::Format("Failed to send crash report with error: %s", StringifyReportResult(result));
         
         return result == google_breakpad::RESULT_SUCCEEDED;
     }
@@ -94,7 +94,7 @@ namespace
             files["comments.txt"] = commentsFilePath.ToStdString();
         }
 
-        std::string response, error;
+        std::string response, resultErr;
         bool success = google_breakpad::HTTPUpload::SendRequest(
             url,
             arguments,
@@ -104,10 +104,10 @@ namespace
             std::string(),
             &response,
             NULL,
-            &error);
+            &resultErr);
 
         if(!success)
-            errorString = wxString::Format("SendMinidump failed with error: %s", error.c_str());
+            error = wxString::Format("Failed to send crash report with error: %s", resultErr.c_str());
             
         return success;
     }
@@ -421,7 +421,7 @@ bool CrashReportApp::OnInit()
         {
             wxString error;
             auto result = SendMinidump(mURL, mMinidumpPath, mArguments, wxEmptyString, error);
-            if(!result && mShowError)
+            if(!result)
                 wxMessageBox(error);
         }
     }
@@ -467,7 +467,6 @@ void CrashReportApp::OnInitCmdLine(wxCmdLineParser& parser)
     static const wxCmdLineEntryDesc cmdLineEntryDesc[] =
     {
          { wxCMD_LINE_SWITCH, "s", "silent", "Send without displaying the confirmation dialog" },
-         {wxCMD_LINE_SWITCH, "e", "error_code", "Show error code/message on sending failure" },
          { wxCMD_LINE_OPTION, "u", "url", "Crash report server URL", wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL },
          { wxCMD_LINE_OPTION, "a", "args", "A set of arguments to send", wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL },
          { wxCMD_LINE_PARAM,  NULL, NULL, "path to minidump file", wxCMD_LINE_VAL_STRING, wxCMD_LINE_OPTION_MANDATORY },
@@ -501,7 +500,6 @@ bool CrashReportApp::OnCmdLineParsed(wxCmdLineParser& parser)
     }
     mMinidumpPath = parser.GetParam(0);
     mSilent = parser.Found("s");
-    mShowError = parser.Found("e");
     
     return wxApp::OnCmdLineParsed(parser);
 }
@@ -538,10 +536,7 @@ void CrashReportApp::ShowCrashReport(const wxString& header, const wxString& tex
 
                 if (!result)
                 {
-                    if(mShowError)
-                        wxMessageBox(error);
-                    else
-                        wxMessageBox(_("Failed to send crash report"));
+                    wxMessageBox(error);
                 }
                 return result;
             });
diff --git a/crashreporter/CrashReportApp.h b/crashreporter/CrashReportApp.h
index 88eee2ddf4fe..a5710e331aa1 100644
--- a/crashreporter/CrashReportApp.h
+++ b/crashreporter/CrashReportApp.h
@@ -24,7 +24,6 @@ class CrashReportApp final : public wxApp
     std::map<std::string, std::string> mArguments;
 
     bool mSilent{ false };
-    bool mShowError { false };
 public:
     bool OnInit() override;
     void OnInitCmdLine(wxCmdLineParser& parser) override;