From 660b91b07788077cfee9ba309d45db6819c00781 Mon Sep 17 00:00:00 2001 From: Markus Mohrhard Date: Fri, 3 Jun 2016 13:26:46 +0200 Subject: [PATCH] report the crash id back to the user Change-Id: I5cc1e698294a5674d691529af8cc14e4cd87a711 Reviewed-on: https://gerrit.libreoffice.org/25865 Tested-by: Jenkins Reviewed-by: Markus Mohrhard --- desktop/source/minidump/minidump.cxx | 7 +++-- desktop/source/minidump/minidump_upload.cxx | 4 ++- include/desktop/minidump.hxx | 2 +- svx/source/dialog/crashreportdlg.cxx | 29 ++++++++++++++--- svx/source/dialog/crashreportdlg.hxx | 5 +++ svx/uiconfig/ui/crashreportdlg.ui | 35 +++++++++++++++++++-- 6 files changed, 69 insertions(+), 13 deletions(-) diff --git a/desktop/source/minidump/minidump.cxx b/desktop/source/minidump/minidump.cxx index c0d68c298fda..0075ca9d2b1f 100644 --- a/desktop/source/minidump/minidump.cxx +++ b/desktop/source/minidump/minidump.cxx @@ -82,7 +82,7 @@ std::string generate_json(const std::map& parameters) return stream.str(); } -bool uploadContent(std::map& parameters) +bool uploadContent(std::map& parameters, std::string& response) { CURL* curl = curl_easy_init(); if (!curl) @@ -175,6 +175,7 @@ bool uploadContent(std::map& parameters) std::cerr << response_body << " " << error_description << std::endl; + response = response_body; if( CURLE_OK != cc ) return false; @@ -182,7 +183,7 @@ bool uploadContent(std::map& parameters) return true; } -bool readConfig(const std::string& iniPath) +bool readConfig(const std::string& iniPath, std::string& response) { std::ifstream file(iniPath); std::map parameters = readStrings(file); @@ -200,7 +201,7 @@ bool readConfig(const std::string& iniPath) return false; } - return uploadContent(parameters); + return uploadContent(parameters, response); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/minidump/minidump_upload.cxx b/desktop/source/minidump/minidump_upload.cxx index 6a581db6a5a6..934f1add7268 100644 --- a/desktop/source/minidump/minidump_upload.cxx +++ b/desktop/source/minidump/minidump_upload.cxx @@ -20,9 +20,11 @@ int main(int argc, char** argv) } std::string iniPath(argv[1]); - if (!readConfig(iniPath)) + std::string response; + if (!readConfig(iniPath, response)) return EXIT_FAILURE; + std::cout << "Response: " << response << std::endl; return EXIT_SUCCESS; } diff --git a/include/desktop/minidump.hxx b/include/desktop/minidump.hxx index 21d52e80ddae..bdd91b26dce9 100644 --- a/include/desktop/minidump.hxx +++ b/include/desktop/minidump.hxx @@ -12,7 +12,7 @@ #include -bool readConfig(const std::string& iniPath); +bool readConfig(const std::string& iniPath, std::string& response); #endif diff --git a/svx/source/dialog/crashreportdlg.cxx b/svx/source/dialog/crashreportdlg.cxx index 511199b4bf5f..00dcedd0f76e 100644 --- a/svx/source/dialog/crashreportdlg.cxx +++ b/svx/source/dialog/crashreportdlg.cxx @@ -23,9 +23,13 @@ CrashReportDialog::CrashReportDialog(vcl::Window* pParent): { get(mpBtnSend, "btn_send"); get(mpBtnCancel, "btn_cancel"); + get(mpBtnClose, "btn_close"); + get(mpEditPreUpload, "ed_pre"); + get(mpEditPostUpload, "ed_post"); mpBtnSend->SetClickHdl(LINK(this, CrashReportDialog, BtnHdl)); mpBtnCancel->SetClickHdl(LINK(this, CrashReportDialog, BtnHdl)); + mpBtnClose->SetClickHdl(LINK(this, CrashReportDialog, BtnHdl)); } CrashReportDialog::~CrashReportDialog() @@ -37,6 +41,9 @@ void CrashReportDialog::dispose() { mpBtnSend.clear(); mpBtnCancel.clear(); + mpBtnClose.clear(); + mpEditPreUpload.clear(); + mpEditPostUpload.clear(); Dialog::dispose(); } @@ -59,17 +66,29 @@ IMPL_LINK_TYPED(CrashReportDialog, BtnHdl, Button*, pBtn, void) { std::string ini_path = CrashReporter::getIniFileName(); - readConfig(ini_path); - // TODO: moggi: return the id for the user to look it up - Close(); + std::string response; + bool bSuccess = readConfig(ini_path, response); + + OUString aCrashID = OUString::createFromAscii(response.c_str()); + + if (bSuccess) + mpEditPostUpload->SetText(mpEditPostUpload->GetText() + " " + aCrashID); + else + mpEditPostUpload->SetText(mpEditPostUpload->GetText() + " Error!"); + + mpBtnClose->Show(); + mpEditPreUpload->Hide(); + mpEditPostUpload->Show(); + mpBtnSend->Hide(); + mpBtnCancel->Hide(); } else if (pBtn == mpBtnCancel.get()) { Close(); } - else + else if (pBtn == mpBtnClose.get()) { - assert(false); + Close(); } } diff --git a/svx/source/dialog/crashreportdlg.hxx b/svx/source/dialog/crashreportdlg.hxx index d1304a1063e4..f090af1211a6 100644 --- a/svx/source/dialog/crashreportdlg.hxx +++ b/svx/source/dialog/crashreportdlg.hxx @@ -12,6 +12,8 @@ #include #include +#include +#include class CrashReportDialog : public Dialog { @@ -27,6 +29,9 @@ private: VclPtr