From 97c15865a5ae936ff0cd0fb2413a00f0d50fad45 Mon Sep 17 00:00:00 2001 From: John Preston Date: Mon, 11 Dec 2017 18:45:29 +0400 Subject: [PATCH] Move some code around. Move logs:SignalHandlers to core/crash_reports:CrashReports. Move all pre-launch windows to core/crash_report_window module. Move some global code to core/launcher:Launcher. It should replace settings / platform_specific module in some way. --- Telegram/SourceFiles/apiwrap.cpp | 2 +- Telegram/SourceFiles/app.cpp | 3 +- Telegram/SourceFiles/application.cpp | 21 +- Telegram/SourceFiles/application.h | 8 +- Telegram/SourceFiles/boxes/stickers_box.cpp | 4 +- .../SourceFiles/chat_helpers/stickers.cpp | 58 +- Telegram/SourceFiles/chat_helpers/stickers.h | 4 + .../chat_helpers/stickers_list_widget.cpp | 6 +- .../SourceFiles/core/crash_report_window.cpp | 1080 +++++++++++++++++ .../SourceFiles/core/crash_report_window.h | 226 ++++ Telegram/SourceFiles/core/crash_reports.cpp | 576 +++++++++ Telegram/SourceFiles/core/crash_reports.h | 81 ++ Telegram/SourceFiles/core/launcher.cpp | 106 ++ Telegram/SourceFiles/core/launcher.h | 45 + .../dialogs/dialogs_inner_widget.cpp | 3 +- Telegram/SourceFiles/history/history.cpp | 11 +- .../SourceFiles/history/history_widget.cpp | 9 +- Telegram/SourceFiles/logs.cpp | 1074 ++++------------ Telegram/SourceFiles/logs.h | 133 +- Telegram/SourceFiles/main.cpp | 46 +- Telegram/SourceFiles/mainwidget.cpp | 4 +- Telegram/SourceFiles/mainwindow.cpp | 1055 ---------------- Telegram/SourceFiles/mainwindow.h | 216 ---- .../media/media_audio_ffmpeg_loader.cpp | 6 +- Telegram/SourceFiles/messenger.cpp | 4 +- Telegram/SourceFiles/messenger.h | 26 +- Telegram/SourceFiles/mtproto/connection.cpp | 21 +- Telegram/SourceFiles/mtproto/facade.h | 2 +- Telegram/SourceFiles/mtproto/session.cpp | 32 +- Telegram/SourceFiles/mtproto/session.h | 1 + .../platform/linux/launcher_linux.cpp | 28 + .../platform/linux/launcher_linux.h | 36 + .../platform/linux/specific_linux.cpp | 3 +- .../SourceFiles/platform/mac/launcher_mac.h | 36 + .../SourceFiles/platform/mac/launcher_mac.mm | 32 + .../SourceFiles/platform/mac/specific_mac.mm | 7 +- .../platform/mac/specific_mac_p.mm | 3 +- .../SourceFiles/platform/platform_launcher.h | 43 + .../SourceFiles/platform/win/launcher_win.cpp | 28 + .../SourceFiles/platform/win/launcher_win.h | 36 + .../SourceFiles/platform/win/specific_win.cpp | 13 +- Telegram/SourceFiles/settings.cpp | 27 +- Telegram/SourceFiles/settings.h | 51 +- .../SourceFiles/storage/file_download.cpp | 5 +- Telegram/SourceFiles/storage/localstorage.cpp | 11 +- Telegram/SourceFiles/ui/text/text_block.cpp | 6 +- Telegram/build/build.sh | 5 + Telegram/gyp/telegram_sources.txt | 13 + 48 files changed, 2873 insertions(+), 2373 deletions(-) create mode 100644 Telegram/SourceFiles/core/crash_report_window.cpp create mode 100644 Telegram/SourceFiles/core/crash_report_window.h create mode 100644 Telegram/SourceFiles/core/crash_reports.cpp create mode 100644 Telegram/SourceFiles/core/crash_reports.h create mode 100644 Telegram/SourceFiles/core/launcher.cpp create mode 100644 Telegram/SourceFiles/core/launcher.h create mode 100644 Telegram/SourceFiles/platform/linux/launcher_linux.cpp create mode 100644 Telegram/SourceFiles/platform/linux/launcher_linux.h create mode 100644 Telegram/SourceFiles/platform/mac/launcher_mac.h create mode 100644 Telegram/SourceFiles/platform/mac/launcher_mac.mm create mode 100644 Telegram/SourceFiles/platform/platform_launcher.h create mode 100644 Telegram/SourceFiles/platform/win/launcher_win.cpp create mode 100644 Telegram/SourceFiles/platform/win/launcher_win.h diff --git a/Telegram/SourceFiles/apiwrap.cpp b/Telegram/SourceFiles/apiwrap.cpp index ff879fa92..cdbbb24c7 100644 --- a/Telegram/SourceFiles/apiwrap.cpp +++ b/Telegram/SourceFiles/apiwrap.cpp @@ -946,7 +946,7 @@ void ApiWrap::saveStickerSets(const Stickers::Order &localOrder, const Stickers: request(base::take(_stickersClearRecentRequestId)).cancel(); auto writeInstalled = true, writeRecent = false, writeCloudRecent = false, writeFaved = false, writeArchived = false; - auto &recent = cGetRecentStickers(); + auto &recent = Stickers::GetRecentPack(); auto &sets = Auth().data().stickerSetsRef(); _stickersOrder = localOrder; diff --git a/Telegram/SourceFiles/app.cpp b/Telegram/SourceFiles/app.cpp index aa69e6cd3..4d535917c 100644 --- a/Telegram/SourceFiles/app.cpp +++ b/Telegram/SourceFiles/app.cpp @@ -46,6 +46,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "numbers.h" #include "observer_peer.h" #include "auth_session.h" +#include "core/crash_reports.h" #include "storage/storage_facade.h" #include "storage/storage_shared_media.h" #include "window/themes/window_theme.h" @@ -472,7 +473,7 @@ namespace { QString pname = (showPhoneChanged || phoneChanged || nameChanged) ? ((showPhone && !phone.isEmpty()) ? formatPhone(phone) : QString()) : data->nameOrPhone; if (!minimal && d.is_self() && uname != data->username) { - SignalHandlers::setCrashAnnotation("Username", uname); + CrashReports::SetAnnotation("Username", uname); } data->setName(fname, lname, pname, uname); if (d.has_photo()) { diff --git a/Telegram/SourceFiles/application.cpp b/Telegram/SourceFiles/application.cpp index 2e27d5063..14be3e3e0 100644 --- a/Telegram/SourceFiles/application.cpp +++ b/Telegram/SourceFiles/application.cpp @@ -26,8 +26,10 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "storage/localstorage.h" #include "autoupdater.h" #include "window/notifications_manager.h" +#include "core/crash_reports.h" #include "messenger.h" #include "base/timer.h" +#include "core/crash_report_window.h" namespace { @@ -71,8 +73,13 @@ QString _escapeFrom7bit(const QString &str) { } // namespace -Application::Application(int &argc, char **argv) : QApplication(argc, argv) { - QByteArray d(QFile::encodeName(QDir(cWorkingDir()).absolutePath())); +Application::Application( + not_null launcher, + int &argc, + char **argv) +: QApplication(argc, argv) +, _launcher(launcher) { + const auto d = QFile::encodeName(QDir(cWorkingDir()).absolutePath()); char h[33] = { 0 }; hashMd5Hex(d.constData(), d.size(), h); #ifndef OS_MAC_STORE @@ -206,12 +213,12 @@ void Application::singleInstanceChecked() { if (!Logs::started() || (!cManyInstance() && !Logs::instanceChecked())) { new NotStartedWindow(); } else { - SignalHandlers::Status status = SignalHandlers::start(); - if (status == SignalHandlers::CantOpen) { + const auto status = CrashReports::Start(); + if (status == CrashReports::CantOpen) { new NotStartedWindow(); - } else if (status == SignalHandlers::LastCrashed) { + } else if (status == CrashReports::LastCrashed) { if (Sandbox::LastCrashDump().isEmpty()) { // don't handle bad closing for now - if (SignalHandlers::restart() == SignalHandlers::CantOpen) { + if (CrashReports::Restart() == CrashReports::CantOpen) { new NotStartedWindow(); } else { Sandbox::launch(); @@ -313,7 +320,7 @@ void Application::startApplication() { void Application::createMessenger() { Expects(!App::quitting()); - _messengerInstance = std::make_unique(); + _messengerInstance = std::make_unique(_launcher); } void Application::closeApplication() { diff --git a/Telegram/SourceFiles/application.h b/Telegram/SourceFiles/application.h index eec0ffc84..b5ab9c880 100644 --- a/Telegram/SourceFiles/application.h +++ b/Telegram/SourceFiles/application.h @@ -21,11 +21,16 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #pragma once class UpdateChecker; + +namespace Core { +class Launcher; +} // namespace Core + class Application : public QApplication { Q_OBJECT public: - Application(int &argc, char **argv); + Application(not_null launcher, int &argc, char **argv); bool event(QEvent *e) override; @@ -55,6 +60,7 @@ private: typedef QPair LocalClient; typedef QList LocalClients; + not_null _launcher; std::unique_ptr _messengerInstance; QString _localServerName, _localSocketReadData; diff --git a/Telegram/SourceFiles/boxes/stickers_box.cpp b/Telegram/SourceFiles/boxes/stickers_box.cpp index 109b1dc37..1d0f9c42c 100644 --- a/Telegram/SourceFiles/boxes/stickers_box.cpp +++ b/Telegram/SourceFiles/boxes/stickers_box.cpp @@ -1551,13 +1551,13 @@ int StickersBox::Inner::fillSetCount(const Stickers::Set &set) const { auto customIt = Auth().data().stickerSets().constFind(Stickers::CustomSetId); if (customIt != Auth().data().stickerSets().cend()) { added = customIt->stickers.size(); - for_const (auto &sticker, cGetRecentStickers()) { + for_const (auto &sticker, Stickers::GetRecentPack()) { if (customIt->stickers.indexOf(sticker.first) < 0) { ++added; } } } else { - added = cGetRecentStickers().size(); + added = Stickers::GetRecentPack().size(); } } return result + added; diff --git a/Telegram/SourceFiles/chat_helpers/stickers.cpp b/Telegram/SourceFiles/chat_helpers/stickers.cpp index ad9f28981..0269dd650 100644 --- a/Telegram/SourceFiles/chat_helpers/stickers.cpp +++ b/Telegram/SourceFiles/chat_helpers/stickers.cpp @@ -347,7 +347,7 @@ void SetsReceived(const QVector &data, int32 hash) { } } auto writeRecent = false; - auto &recent = cGetRecentStickers(); + auto &recent = GetRecentPack(); for (auto it = sets.begin(), e = sets.end(); it != e;) { bool installed = (it->flags & MTPDstickerSet::Flag::f_installed); bool featured = (it->flags & MTPDstickerSet_ClientFlag::f_featured); @@ -449,7 +449,7 @@ void SpecialSetReceived(uint64 setId, const QString &setTitle, const QVectorstickers.indexOf(i->first) >= 0 && pack.indexOf(i->first) < 0) { i = recent.erase(i); @@ -748,7 +748,7 @@ Set *FeedSetFull(const MTPmessages_StickerSet &data) { } auto writeRecent = false; - auto &recent = cGetRecentStickers(); + auto &recent = GetRecentPack(); for (auto i = recent.begin(); i != recent.cend();) { if (set->stickers.indexOf(i->first) >= 0 && pack.indexOf(i->first) < 0) { i = recent.erase(i); @@ -816,4 +816,56 @@ QString GetSetTitle(const MTPDstickerSet &s) { return title; } +RecentStickerPack &GetRecentPack() { + if (cRecentStickers().isEmpty() && !cRecentStickersPreload().isEmpty()) { + const auto p = cRecentStickersPreload(); + cSetRecentStickersPreload(RecentStickerPreload()); + + auto &recent = cRefRecentStickers(); + recent.reserve(p.size()); + for (const auto &preloaded : p) { + const auto document = App::document(preloaded.first); + if (!document || !document->sticker()) continue; + + recent.push_back(qMakePair(document, preloaded.second)); + } + } + return cRefRecentStickers(); +} + +void IncrementRecentHashtag(RecentHashtagPack &recent, const QString &tag) { + auto i = recent.begin(), e = recent.end(); + for (; i != e; ++i) { + if (i->first == tag) { + ++i->second; + if (qAbs(i->second) > 0x4000) { + for (auto j = recent.begin(); j != e; ++j) { + if (j->second > 1) { + j->second /= 2; + } else if (j->second > 0) { + j->second = 1; + } + } + } + for (; i != recent.begin(); --i) { + if (qAbs((i - 1)->second) > qAbs(i->second)) { + break; + } + qSwap(*i, *(i - 1)); + } + break; + } + } + if (i == e) { + while (recent.size() >= 64) recent.pop_back(); + recent.push_back(qMakePair(tag, 1)); + for (i = recent.end() - 1; i != recent.begin(); --i) { + if ((i - 1)->second > i->second) { + break; + } + qSwap(*i, *(i - 1)); + } + } +} + } // namespace Stickers diff --git a/Telegram/SourceFiles/chat_helpers/stickers.h b/Telegram/SourceFiles/chat_helpers/stickers.h index ddb7bb794..67720c250 100644 --- a/Telegram/SourceFiles/chat_helpers/stickers.h +++ b/Telegram/SourceFiles/chat_helpers/stickers.h @@ -85,4 +85,8 @@ Set *FeedSetFull(const MTPmessages_StickerSet &data); QString GetSetTitle(const MTPDstickerSet &s); +RecentStickerPack &GetRecentPack(); + +void IncrementRecentHashtag(RecentHashtagPack &recent, const QString &tag); + } // namespace Stickers diff --git a/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp b/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp index 98648648d..614feb64b 100644 --- a/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp +++ b/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp @@ -1090,7 +1090,7 @@ void StickersListWidget::removeRecentSticker(int section, int index) { clearSelection(); bool refresh = false; auto sticker = _mySets[section].pack[index]; - auto &recent = cGetRecentStickers(); + auto &recent = Stickers::GetRecentPack(); for (int32 i = 0, l = recent.size(); i < l; ++i) { if (recent.at(i).first == sticker) { recent.removeAt(i); @@ -1302,7 +1302,7 @@ void StickersListWidget::refreshRecentStickers(bool performResize) { _custom.clear(); clearSelection(); auto &sets = Auth().data().stickerSets(); - auto &recent = cGetRecentStickers(); + auto &recent = Stickers::GetRecentPack(); auto customIt = sets.constFind(Stickers::CustomSetId); auto cloudIt = sets.constFind(Stickers::CloudRecentSetId); @@ -1773,7 +1773,7 @@ void StickersListWidget::removeSet(uint64 setId) { request(MTPmessages_UninstallStickerSet(MTP_inputStickerSetShortName(MTP_string(it->shortName)))).send(); } auto writeRecent = false; - auto &recent = cGetRecentStickers(); + auto &recent = Stickers::GetRecentPack(); for (auto i = recent.begin(); i != recent.cend();) { if (it->stickers.indexOf(i->first) >= 0) { i = recent.erase(i); diff --git a/Telegram/SourceFiles/core/crash_report_window.cpp b/Telegram/SourceFiles/core/crash_report_window.cpp new file mode 100644 index 000000000..8e2627760 --- /dev/null +++ b/Telegram/SourceFiles/core/crash_report_window.cpp @@ -0,0 +1,1080 @@ +/* +This file is part of Telegram Desktop, +the official desktop version of Telegram messaging app, see https://telegram.org + +Telegram Desktop is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +It is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +In addition, as a special exception, the copyright holders give permission +to link the code of portions of this program with the OpenSSL library. + +Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE +Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org +*/ +#include "core/crash_report_window.h" + +#include "core/crash_reports.h" +#include "window/main_window.h" +#include "platform/platform_specific.h" +#include "application.h" +#include "base/zlib_help.h" +#include "autoupdater.h" + +PreLaunchWindow *PreLaunchWindowInstance = nullptr; + +PreLaunchWindow::PreLaunchWindow(QString title) { + Fonts::Start(); + + auto icon = Window::CreateIcon(); + setWindowIcon(icon); + setWindowFlags(Qt::Dialog | Qt::CustomizeWindowHint | Qt::WindowTitleHint | Qt::WindowCloseButtonHint); + + setWindowTitle(title.isEmpty() ? qsl("Telegram") : title); + + QPalette p(palette()); + p.setColor(QPalette::Background, QColor(255, 255, 255)); + setPalette(p); + + QLabel tmp(this); + tmp.setText(qsl("Tmp")); + _size = tmp.sizeHint().height(); + + int paddingVertical = (_size / 2); + int paddingHorizontal = _size; + int borderRadius = (_size / 5); + setStyleSheet(qsl("QPushButton { padding: %1px %2px; background-color: #ffffff; border-radius: %3px; }\nQPushButton#confirm:hover, QPushButton#cancel:hover { background-color: #e3f1fa; color: #2f9fea; }\nQPushButton#confirm { color: #2f9fea; }\nQPushButton#cancel { color: #aeaeae; }\nQLineEdit { border: 1px solid #e0e0e0; padding: 5px; }\nQLineEdit:focus { border: 2px solid #37a1de; padding: 4px; }").arg(paddingVertical).arg(paddingHorizontal).arg(borderRadius)); + if (!PreLaunchWindowInstance) { + PreLaunchWindowInstance = this; + } +} + +void PreLaunchWindow::activate() { + setWindowState(windowState() & ~Qt::WindowMinimized); + setVisible(true); + psActivateProcess(); + activateWindow(); +} + +PreLaunchWindow *PreLaunchWindow::instance() { + return PreLaunchWindowInstance; +} + +PreLaunchWindow::~PreLaunchWindow() { + if (PreLaunchWindowInstance == this) { + PreLaunchWindowInstance = nullptr; + } +} + +PreLaunchLabel::PreLaunchLabel(QWidget *parent) : QLabel(parent) { + QFont labelFont(font()); + labelFont.setFamily(Fonts::GetOverride(qsl("Open Sans Semibold"))); + labelFont.setPixelSize(static_cast(parent)->basicSize()); + setFont(labelFont); + + QPalette p(palette()); + p.setColor(QPalette::Foreground, QColor(0, 0, 0)); + setPalette(p); + show(); +}; + +void PreLaunchLabel::setText(const QString &text) { + QLabel::setText(text); + updateGeometry(); + resize(sizeHint()); +} + +PreLaunchInput::PreLaunchInput(QWidget *parent, bool password) : QLineEdit(parent) { + QFont logFont(font()); + logFont.setFamily(Fonts::GetOverride(qsl("Open Sans"))); + logFont.setPixelSize(static_cast(parent)->basicSize()); + setFont(logFont); + + QPalette p(palette()); + p.setColor(QPalette::Foreground, QColor(0, 0, 0)); + setPalette(p); + + QLineEdit::setTextMargins(0, 0, 0, 0); + setContentsMargins(0, 0, 0, 0); + if (password) { + setEchoMode(QLineEdit::Password); + } + show(); +}; + +PreLaunchLog::PreLaunchLog(QWidget *parent) : QTextEdit(parent) { + QFont logFont(font()); + logFont.setFamily(Fonts::GetOverride(qsl("Open Sans"))); + logFont.setPixelSize(static_cast(parent)->basicSize()); + setFont(logFont); + + QPalette p(palette()); + p.setColor(QPalette::Foreground, QColor(96, 96, 96)); + setPalette(p); + + setReadOnly(true); + setFrameStyle(QFrame::NoFrame | QFrame::Plain); + viewport()->setAutoFillBackground(false); + setContentsMargins(0, 0, 0, 0); + document()->setDocumentMargin(0); + show(); +}; + +PreLaunchButton::PreLaunchButton(QWidget *parent, bool confirm) : QPushButton(parent) { + setFlat(true); + + setObjectName(confirm ? "confirm" : "cancel"); + + QFont closeFont(font()); + closeFont.setFamily(Fonts::GetOverride(qsl("Open Sans Semibold"))); + closeFont.setPixelSize(static_cast(parent)->basicSize()); + setFont(closeFont); + + setCursor(Qt::PointingHandCursor); + show(); +}; + +void PreLaunchButton::setText(const QString &text) { + QPushButton::setText(text); + updateGeometry(); + resize(sizeHint()); +} + +PreLaunchCheckbox::PreLaunchCheckbox(QWidget *parent) : QCheckBox(parent) { + setTristate(false); + setCheckState(Qt::Checked); + + QFont closeFont(font()); + closeFont.setFamily(Fonts::GetOverride(qsl("Open Sans Semibold"))); + closeFont.setPixelSize(static_cast(parent)->basicSize()); + setFont(closeFont); + + setCursor(Qt::PointingHandCursor); + show(); +}; + +void PreLaunchCheckbox::setText(const QString &text) { + QCheckBox::setText(text); + updateGeometry(); + resize(sizeHint()); +} + +NotStartedWindow::NotStartedWindow() +: _label(this) +, _log(this) +, _close(this) { + _label.setText(qsl("Could not start Telegram Desktop!\nYou can see complete log below:")); + + _log.setPlainText(Logs::full()); + + connect(&_close, SIGNAL(clicked()), this, SLOT(close())); + _close.setText(qsl("CLOSE")); + + QRect scr(QApplication::primaryScreen()->availableGeometry()); + move(scr.x() + (scr.width() / 6), scr.y() + (scr.height() / 6)); + updateControls(); + show(); +} + +void NotStartedWindow::updateControls() { + _label.show(); + _log.show(); + _close.show(); + + QRect scr(QApplication::primaryScreen()->availableGeometry()); + QSize s(scr.width() / 2, scr.height() / 2); + if (s == size()) { + resizeEvent(0); + } else { + resize(s); + } +} + +void NotStartedWindow::closeEvent(QCloseEvent *e) { + deleteLater(); +} + +void NotStartedWindow::resizeEvent(QResizeEvent *e) { + int padding = _size; + _label.setGeometry(padding, padding, width() - 2 * padding, _label.sizeHint().height()); + _log.setGeometry(padding, padding * 2 + _label.sizeHint().height(), width() - 2 * padding, height() - 4 * padding - _label.height() - _close.height()); + _close.setGeometry(width() - padding - _close.width(), height() - padding - _close.height(), _close.width(), _close.height()); +} + +LastCrashedWindow::LastCrashedWindow() +: _port(80) +, _label(this) +, _pleaseSendReport(this) +, _yourReportName(this) +, _minidump(this) +, _report(this) +, _send(this) +, _sendSkip(this, false) +, _networkSettings(this) +, _continue(this) +, _showReport(this) +, _saveReport(this) +, _getApp(this) +, _includeUsername(this) +, _reportText(QString::fromUtf8(Sandbox::LastCrashDump())) +, _reportShown(false) +, _reportSaved(false) +, _sendingState(Sandbox::LastCrashDump().isEmpty() ? SendingNoReport : SendingUpdateCheck) +, _updating(this) +, _sendingProgress(0) +, _sendingTotal(0) +, _checkReply(0) +, _sendReply(0) +#ifndef TDESKTOP_DISABLE_AUTOUPDATE +, _updatingCheck(this) +, _updatingSkip(this, false) +#endif // !TDESKTOP_DISABLE_AUTOUPDATE +{ + excludeReportUsername(); + + if (!cAlphaVersion() && !cBetaVersion()) { // currently accept crash reports only from testers + _sendingState = SendingNoReport; + } + if (_sendingState != SendingNoReport) { + qint64 dumpsize = 0; + QString dumpspath = cWorkingDir() + qsl("tdata/dumps"); +#if defined Q_OS_MAC && !defined MAC_USE_BREAKPAD + dumpspath += qsl("/completed"); +#endif + QString possibleDump = getReportField(qstr("minidump"), qstr("Minidump:")); + if (!possibleDump.isEmpty()) { + if (!possibleDump.startsWith('/')) { + possibleDump = dumpspath + '/' + possibleDump; + } + if (!possibleDump.endsWith(qstr(".dmp"))) { + possibleDump += qsl(".dmp"); + } + QFileInfo possibleInfo(possibleDump); + if (possibleInfo.exists()) { + _minidumpName = possibleInfo.fileName(); + _minidumpFull = possibleInfo.absoluteFilePath(); + dumpsize = possibleInfo.size(); + } + } + if (_minidumpFull.isEmpty()) { + QString maxDump, maxDumpFull; + QDateTime maxDumpModified, workingModified = QFileInfo(cWorkingDir() + qsl("tdata/working")).lastModified(); + QFileInfoList list = QDir(dumpspath).entryInfoList(); + for (int32 i = 0, l = list.size(); i < l; ++i) { + QString name = list.at(i).fileName(); + if (name.endsWith(qstr(".dmp"))) { + QDateTime modified = list.at(i).lastModified(); + if (maxDump.isEmpty() || qAbs(workingModified.secsTo(modified)) < qAbs(workingModified.secsTo(maxDumpModified))) { + maxDump = name; + maxDumpModified = modified; + maxDumpFull = list.at(i).absoluteFilePath(); + dumpsize = list.at(i).size(); + } + } + } + if (!maxDump.isEmpty() && qAbs(workingModified.secsTo(maxDumpModified)) < 10) { + _minidumpName = maxDump; + _minidumpFull = maxDumpFull; + } + } + if (_minidumpName.isEmpty()) { // currently don't accept crash reports without dumps from google libraries + _sendingState = SendingNoReport; + } else { + _minidump.setText(qsl("+ %1 (%2 KB)").arg(_minidumpName).arg(dumpsize / 1024)); + } + } + if (_sendingState != SendingNoReport) { + QString version = getReportField(qstr("version"), qstr("Version:")); + QString current = cBetaVersion() ? qsl("-%1").arg(cBetaVersion()) : QString::number(AppVersion); + if (version != current) { // currently don't accept crash reports from not current app version + _sendingState = SendingNoReport; + } + } + + _networkSettings.setText(qsl("NETWORK SETTINGS")); + connect(&_networkSettings, SIGNAL(clicked()), this, SLOT(onNetworkSettings())); + + if (_sendingState == SendingNoReport) { + _label.setText(qsl("Last time Telegram Desktop was not closed properly.")); + } else { + _label.setText(qsl("Last time Telegram Desktop crashed :(")); + } + +#ifndef TDESKTOP_DISABLE_AUTOUPDATE + _updatingCheck.setText(qsl("TRY AGAIN")); + connect(&_updatingCheck, SIGNAL(clicked()), this, SLOT(onUpdateRetry())); + _updatingSkip.setText(qsl("SKIP")); + connect(&_updatingSkip, SIGNAL(clicked()), this, SLOT(onUpdateSkip())); + + Sandbox::connect(SIGNAL(updateChecking()), this, SLOT(onUpdateChecking())); + Sandbox::connect(SIGNAL(updateLatest()), this, SLOT(onUpdateLatest())); + Sandbox::connect(SIGNAL(updateProgress(qint64,qint64)), this, SLOT(onUpdateDownloading(qint64,qint64))); + Sandbox::connect(SIGNAL(updateFailed()), this, SLOT(onUpdateFailed())); + Sandbox::connect(SIGNAL(updateReady()), this, SLOT(onUpdateReady())); + + switch (Sandbox::updatingState()) { + case Application::UpdatingDownload: + setUpdatingState(UpdatingDownload, true); + setDownloadProgress(Sandbox::updatingReady(), Sandbox::updatingSize()); + break; + case Application::UpdatingReady: setUpdatingState(UpdatingReady, true); break; + default: setUpdatingState(UpdatingCheck, true); break; + } + + cSetLastUpdateCheck(0); + Sandbox::startUpdateCheck(); +#else // !TDESKTOP_DISABLE_AUTOUPDATE + _updating.setText(qsl("Please check if there is a new version available.")); + if (_sendingState != SendingNoReport) { + _sendingState = SendingNone; + } +#endif // else for !TDESKTOP_DISABLE_AUTOUPDATE + + _pleaseSendReport.setText(qsl("Please send us a crash report.")); + _yourReportName.setText(qsl("Your Report Tag: %1\nYour User Tag: %2").arg(QString(_minidumpName).replace(".dmp", "")).arg(Sandbox::UserTag(), 0, 16)); + _yourReportName.setCursor(style::cur_text); + _yourReportName.setTextInteractionFlags(Qt::TextSelectableByMouse); + + _includeUsername.setText(qsl("Include username @%1 as your contact info").arg(_reportUsername)); + + _report.setPlainText(_reportTextNoUsername); + + _showReport.setText(qsl("VIEW REPORT")); + connect(&_showReport, SIGNAL(clicked()), this, SLOT(onViewReport())); + _saveReport.setText(qsl("SAVE TO FILE")); + connect(&_saveReport, SIGNAL(clicked()), this, SLOT(onSaveReport())); + _getApp.setText(qsl("GET THE LATEST OFFICIAL VERSION OF TELEGRAM DESKTOP")); + connect(&_getApp, SIGNAL(clicked()), this, SLOT(onGetApp())); + + _send.setText(qsl("SEND CRASH REPORT")); + connect(&_send, SIGNAL(clicked()), this, SLOT(onSendReport())); + + _sendSkip.setText(qsl("SKIP")); + connect(&_sendSkip, SIGNAL(clicked()), this, SLOT(onContinue())); + _continue.setText(qsl("CONTINUE")); + connect(&_continue, SIGNAL(clicked()), this, SLOT(onContinue())); + + QRect scr(QApplication::primaryScreen()->availableGeometry()); + move(scr.x() + (scr.width() / 6), scr.y() + (scr.height() / 6)); + updateControls(); + show(); +} + +void LastCrashedWindow::onViewReport() { + _reportShown = !_reportShown; + updateControls(); +} + +void LastCrashedWindow::onSaveReport() { + QString to = QFileDialog::getSaveFileName(0, qsl("Telegram Crash Report"), QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation) + qsl("/report.telegramcrash"), qsl("Telegram crash report (*.telegramcrash)")); + if (!to.isEmpty()) { + QFile file(to); + if (file.open(QIODevice::WriteOnly)) { + file.write(getCrashReportRaw()); + _reportSaved = true; + updateControls(); + } + } +} + +QByteArray LastCrashedWindow::getCrashReportRaw() const { + QByteArray result(Sandbox::LastCrashDump()); + if (!_reportUsername.isEmpty() && _includeUsername.checkState() != Qt::Checked) { + result.replace((qsl("Username: ") + _reportUsername).toUtf8(), "Username: _not_included_"); + } + return result; +} + +void LastCrashedWindow::onGetApp() { + QDesktopServices::openUrl(qsl("https://desktop.telegram.org")); +} + +void LastCrashedWindow::excludeReportUsername() { + QString prefix = qstr("Username:"); + QStringList lines = _reportText.split('\n'); + for (int32 i = 0, l = lines.size(); i < l; ++i) { + if (lines.at(i).trimmed().startsWith(prefix)) { + _reportUsername = lines.at(i).trimmed().mid(prefix.size()).trimmed(); + lines.removeAt(i); + break; + } + } + _reportTextNoUsername = _reportUsername.isEmpty() ? _reportText : lines.join('\n'); +} + +QString LastCrashedWindow::getReportField(const QLatin1String &name, const QLatin1String &prefix) { + QStringList lines = _reportText.split('\n'); + for (int32 i = 0, l = lines.size(); i < l; ++i) { + if (lines.at(i).trimmed().startsWith(prefix)) { + QString data = lines.at(i).trimmed().mid(prefix.size()).trimmed(); + + if (name == qstr("version")) { + if (data.endsWith(qstr(" beta"))) { + data = QString::number(-data.replace(QRegularExpression(qsl("[^\\d]")), "").toLongLong()); + } else { + data = QString::number(data.replace(QRegularExpression(qsl("[^\\d]")), "").toLongLong()); + } + } + + return data; + } + } + return QString(); +} + +void LastCrashedWindow::addReportFieldPart(const QLatin1String &name, const QLatin1String &prefix, QHttpMultiPart *multipart) { + QString data = getReportField(name, prefix); + if (!data.isEmpty()) { + QHttpPart reportPart; + reportPart.setHeader(QNetworkRequest::ContentDispositionHeader, QVariant(qsl("form-data; name=\"%1\"").arg(name))); + reportPart.setBody(data.toUtf8()); + multipart->append(reportPart); + } +} + +void LastCrashedWindow::onSendReport() { + if (_checkReply) { + _checkReply->deleteLater(); + _checkReply = nullptr; + } + if (_sendReply) { + _sendReply->deleteLater(); + _sendReply = nullptr; + } + App::setProxySettings(_sendManager); + + QString apiid = getReportField(qstr("apiid"), qstr("ApiId:")), version = getReportField(qstr("version"), qstr("Version:")); + _checkReply = _sendManager.get(QNetworkRequest(qsl("https://tdesktop.com/crash.php?act=query_report&apiid=%1&version=%2&dmp=%3&platform=%4").arg(apiid).arg(version).arg(minidumpFileName().isEmpty() ? 0 : 1).arg(cPlatformString()))); + + connect(_checkReply, SIGNAL(error(QNetworkReply::NetworkError)), this, SLOT(onSendingError(QNetworkReply::NetworkError))); + connect(_checkReply, SIGNAL(finished()), this, SLOT(onCheckingFinished())); + + _pleaseSendReport.setText(qsl("Sending crash report...")); + _sendingState = SendingProgress; + _reportShown = false; + updateControls(); +} + +QString LastCrashedWindow::minidumpFileName() { + QFileInfo dmpFile(_minidumpFull); + if (dmpFile.exists() && dmpFile.size() > 0 && dmpFile.size() < 20 * 1024 * 1024 && + QRegularExpression(qsl("^[a-zA-Z0-9\\-]{1,64}\\.dmp$")).match(dmpFile.fileName()).hasMatch()) { + return dmpFile.fileName(); + } + return QString(); +} + +void LastCrashedWindow::onCheckingFinished() { + if (!_checkReply || _sendReply) return; + + QByteArray result = _checkReply->readAll().trimmed(); + _checkReply->deleteLater(); + _checkReply = nullptr; + + LOG(("Crash report check for sending done, result: %1").arg(QString::fromUtf8(result))); + + if (result == "Old") { + _pleaseSendReport.setText(qsl("This report is about some old version of Telegram Desktop.")); + _sendingState = SendingTooOld; + updateControls(); + return; + } else if (result == "Unofficial") { + _pleaseSendReport.setText(qsl("You use some custom version of Telegram Desktop.")); + _sendingState = SendingUnofficial; + updateControls(); + return; + } else if (result != "Report") { + _pleaseSendReport.setText(qsl("Thank you for your report!")); + _sendingState = SendingDone; + updateControls(); + + CrashReports::Restart(); + return; + } + + auto multipart = new QHttpMultiPart(QHttpMultiPart::FormDataType); + + addReportFieldPart(qstr("platform"), qstr("Platform:"), multipart); + addReportFieldPart(qstr("version"), qstr("Version:"), multipart); + + QHttpPart reportPart; + reportPart.setHeader(QNetworkRequest::ContentTypeHeader, QVariant("application/octet-stream")); + reportPart.setHeader(QNetworkRequest::ContentDispositionHeader, QVariant("form-data; name=\"report\"; filename=\"report.telegramcrash\"")); + reportPart.setBody(getCrashReportRaw()); + multipart->append(reportPart); + + QString dmpName = minidumpFileName(); + if (!dmpName.isEmpty()) { + QFile file(_minidumpFull); + if (file.open(QIODevice::ReadOnly)) { + QByteArray minidump = file.readAll(); + file.close(); + + QString zipName = QString(dmpName).replace(qstr(".dmp"), qstr(".zip")); + + zlib::FileToWrite minidumpZip; + + zip_fileinfo zfi = { { 0, 0, 0, 0, 0, 0 }, 0, 0, 0 }; + QByteArray dmpNameUtf = dmpName.toUtf8(); + minidumpZip.openNewFile(dmpNameUtf.constData(), &zfi, nullptr, 0, nullptr, 0, nullptr, Z_DEFLATED, Z_DEFAULT_COMPRESSION); + minidumpZip.writeInFile(minidump.constData(), minidump.size()); + minidumpZip.closeFile(); + minidumpZip.close(); + + if (minidumpZip.error() == ZIP_OK) { + QHttpPart dumpPart; + dumpPart.setHeader(QNetworkRequest::ContentTypeHeader, QVariant("application/octet-stream")); + dumpPart.setHeader(QNetworkRequest::ContentDispositionHeader, QVariant(qsl("form-data; name=\"dump\"; filename=\"%1\"").arg(zipName))); + dumpPart.setBody(minidumpZip.result()); + multipart->append(dumpPart); + + _minidump.setText(qsl("+ %1 (%2 KB)").arg(zipName).arg(minidumpZip.result().size() / 1024)); + } + } + } + + _sendReply = _sendManager.post(QNetworkRequest(qsl("https://tdesktop.com/crash.php?act=report")), multipart); + multipart->setParent(_sendReply); + + connect(_sendReply, SIGNAL(error(QNetworkReply::NetworkError)), this, SLOT(onSendingError(QNetworkReply::NetworkError))); + connect(_sendReply, SIGNAL(finished()), this, SLOT(onSendingFinished())); + connect(_sendReply, SIGNAL(uploadProgress(qint64,qint64)), this, SLOT(onSendingProgress(qint64,qint64))); + + updateControls(); +} + +void LastCrashedWindow::updateControls() { + int padding = _size, h = padding + _networkSettings.height() + padding; + + _label.show(); +#ifndef TDESKTOP_DISABLE_AUTOUPDATE + h += _networkSettings.height() + padding; + if (_updatingState == UpdatingFail && (_sendingState == SendingNoReport || _sendingState == SendingUpdateCheck)) { + _networkSettings.show(); + _updatingCheck.show(); + _updatingSkip.show(); + _send.hide(); + _sendSkip.hide(); + _continue.hide(); + _pleaseSendReport.hide(); + _yourReportName.hide(); + _includeUsername.hide(); + _getApp.hide(); + _showReport.hide(); + _report.hide(); + _minidump.hide(); + _saveReport.hide(); + h += padding + _updatingCheck.height() + padding; + } else { + if (_updatingState == UpdatingCheck || _sendingState == SendingFail || _sendingState == SendingProgress) { + _networkSettings.show(); + } else { + _networkSettings.hide(); + } + if (_updatingState == UpdatingNone || _updatingState == UpdatingLatest || _updatingState == UpdatingFail) { + h += padding + _updatingCheck.height() + padding; + if (_sendingState == SendingNoReport) { + _pleaseSendReport.hide(); + _yourReportName.hide(); + _includeUsername.hide(); + _getApp.hide(); + _showReport.hide(); + _report.hide(); + _minidump.hide(); + _saveReport.hide(); + _send.hide(); + _sendSkip.hide(); + _continue.show(); + } else { + h += _showReport.height() + padding + _yourReportName.height() + padding; + _pleaseSendReport.show(); + _yourReportName.show(); + if (_reportUsername.isEmpty()) { + _includeUsername.hide(); + } else { + h += _includeUsername.height() + padding; + _includeUsername.show(); + } + if (_sendingState == SendingTooOld || _sendingState == SendingUnofficial) { + QString verStr = getReportField(qstr("version"), qstr("Version:")); + qint64 ver = verStr.isEmpty() ? 0 : verStr.toLongLong(); + if (!ver || (ver == AppVersion) || (ver < 0 && (-ver / 1000) == AppVersion)) { + h += _getApp.height() + padding; + _getApp.show(); + h -= _yourReportName.height() + padding; // hide report name + _yourReportName.hide(); + if (!_reportUsername.isEmpty()) { + h -= _includeUsername.height() + padding; + _includeUsername.hide(); + } + } else { + _getApp.hide(); + } + _showReport.hide(); + _report.hide(); + _minidump.hide(); + _saveReport.hide(); + _send.hide(); + _sendSkip.hide(); + _continue.show(); + } else { + _getApp.hide(); + if (_reportShown) { + h += (_pleaseSendReport.height() * 12.5) + padding + (_minidumpName.isEmpty() ? 0 : (_minidump.height() + padding)); + _report.show(); + if (_minidumpName.isEmpty()) { + _minidump.hide(); + } else { + _minidump.show(); + } + if (_reportSaved || _sendingState == SendingFail || _sendingState == SendingProgress || _sendingState == SendingUploading) { + _saveReport.hide(); + } else { + _saveReport.show(); + } + _showReport.hide(); + } else { + _report.hide(); + _minidump.hide(); + _saveReport.hide(); + if (_sendingState == SendingFail || _sendingState == SendingProgress || _sendingState == SendingUploading) { + _showReport.hide(); + } else { + _showReport.show(); + } + } + if (_sendingState == SendingTooMany || _sendingState == SendingDone) { + _send.hide(); + _sendSkip.hide(); + _continue.show(); + } else { + if (_sendingState == SendingProgress || _sendingState == SendingUploading) { + _send.hide(); + } else { + _send.show(); + } + _sendSkip.show(); + _continue.hide(); + } + } + } + } else { + _getApp.hide(); + _pleaseSendReport.hide(); + _yourReportName.hide(); + _includeUsername.hide(); + _showReport.hide(); + _report.hide(); + _minidump.hide(); + _saveReport.hide(); + _send.hide(); + _sendSkip.hide(); + _continue.hide(); + } + _updatingCheck.hide(); + if (_updatingState == UpdatingCheck || _updatingState == UpdatingDownload) { + h += padding + _updatingSkip.height() + padding; + _updatingSkip.show(); + } else { + _updatingSkip.hide(); + } + } +#else // !TDESKTOP_DISABLE_AUTOUPDATE + h += _networkSettings.height() + padding; + h += padding + _send.height() + padding; + if (_sendingState == SendingNoReport) { + _pleaseSendReport.hide(); + _yourReportName.hide(); + _includeUsername.hide(); + _showReport.hide(); + _report.hide(); + _minidump.hide(); + _saveReport.hide(); + _send.hide(); + _sendSkip.hide(); + _continue.show(); + _networkSettings.hide(); + } else { + h += _showReport.height() + padding + _yourReportName.height() + padding; + _pleaseSendReport.show(); + _yourReportName.show(); + if (_reportUsername.isEmpty()) { + _includeUsername.hide(); + } else { + h += _includeUsername.height() + padding; + _includeUsername.show(); + } + if (_reportShown) { + h += (_pleaseSendReport.height() * 12.5) + padding + (_minidumpName.isEmpty() ? 0 : (_minidump.height() + padding)); + _report.show(); + if (_minidumpName.isEmpty()) { + _minidump.hide(); + } else { + _minidump.show(); + } + _showReport.hide(); + if (_reportSaved || _sendingState == SendingFail || _sendingState == SendingProgress || _sendingState == SendingUploading) { + _saveReport.hide(); + } else { + _saveReport.show(); + } + } else { + _report.hide(); + _minidump.hide(); + _saveReport.hide(); + if (_sendingState == SendingFail || _sendingState == SendingProgress || _sendingState == SendingUploading) { + _showReport.hide(); + } else { + _showReport.show(); + } + } + if (_sendingState == SendingDone) { + _send.hide(); + _sendSkip.hide(); + _continue.show(); + _networkSettings.hide(); + } else { + if (_sendingState == SendingProgress || _sendingState == SendingUploading) { + _send.hide(); + } else { + _send.show(); + } + _sendSkip.show(); + if (_sendingState == SendingFail) { + _networkSettings.show(); + } else { + _networkSettings.hide(); + } + _continue.hide(); + } + } + + _getApp.show(); + h += _networkSettings.height() + padding; +#endif // else for !TDESKTOP_DISABLE_AUTOUPDATE + + QRect scr(QApplication::primaryScreen()->availableGeometry()); + QSize s(2 * padding + QFontMetrics(_label.font()).width(qsl("Last time Telegram Desktop was not closed properly.")) + padding + _networkSettings.width(), h); + if (s == size()) { + resizeEvent(0); + } else { + resize(s); + } +} + +void LastCrashedWindow::onNetworkSettings() { + auto &p = Sandbox::PreLaunchProxy(); + NetworkSettingsWindow *box = new NetworkSettingsWindow(this, p.host, p.port ? p.port : 80, p.user, p.password); + connect(box, SIGNAL(saved(QString, quint32, QString, QString)), this, SLOT(onNetworkSettingsSaved(QString, quint32, QString, QString))); + box->show(); +} + +void LastCrashedWindow::onNetworkSettingsSaved(QString host, quint32 port, QString username, QString password) { + Sandbox::RefPreLaunchProxy().host = host; + Sandbox::RefPreLaunchProxy().port = port ? port : 80; + Sandbox::RefPreLaunchProxy().user = username; + Sandbox::RefPreLaunchProxy().password = password; +#ifndef TDESKTOP_DISABLE_AUTOUPDATE + if ((_updatingState == UpdatingFail && (_sendingState == SendingNoReport || _sendingState == SendingUpdateCheck)) || (_updatingState == UpdatingCheck)) { + Sandbox::stopUpdate(); + cSetLastUpdateCheck(0); + Sandbox::startUpdateCheck(); + } else +#endif // !TDESKTOP_DISABLE_AUTOUPDATE + if (_sendingState == SendingFail || _sendingState == SendingProgress) { + onSendReport(); + } + activate(); +} + +#ifndef TDESKTOP_DISABLE_AUTOUPDATE +void LastCrashedWindow::setUpdatingState(UpdatingState state, bool force) { + if (_updatingState != state || force) { + _updatingState = state; + switch (state) { + case UpdatingLatest: + _updating.setText(qsl("Latest version is installed.")); + if (_sendingState == SendingNoReport) { + QTimer::singleShot(0, this, SLOT(onContinue())); + } else { + _sendingState = SendingNone; + } + break; + case UpdatingReady: + if (checkReadyUpdate()) { + cSetRestartingUpdate(true); + App::quit(); + return; + } else { + setUpdatingState(UpdatingFail); + return; + } + break; + case UpdatingCheck: + _updating.setText(qsl("Checking for updates...")); + break; + case UpdatingFail: + _updating.setText(qsl("Update check failed :(")); + break; + } + updateControls(); + } +} + +void LastCrashedWindow::setDownloadProgress(qint64 ready, qint64 total) { + qint64 readyTenthMb = (ready * 10 / (1024 * 1024)), totalTenthMb = (total * 10 / (1024 * 1024)); + QString readyStr = QString::number(readyTenthMb / 10) + '.' + QString::number(readyTenthMb % 10); + QString totalStr = QString::number(totalTenthMb / 10) + '.' + QString::number(totalTenthMb % 10); + QString res = qsl("Downloading update {ready} / {total} MB..").replace(qstr("{ready}"), readyStr).replace(qstr("{total}"), totalStr); + if (_newVersionDownload != res) { + _newVersionDownload = res; + _updating.setText(_newVersionDownload); + updateControls(); + } +} + +void LastCrashedWindow::onUpdateRetry() { + cSetLastUpdateCheck(0); + Sandbox::startUpdateCheck(); +} + +void LastCrashedWindow::onUpdateSkip() { + if (_sendingState == SendingNoReport) { + onContinue(); + } else { + if (_updatingState == UpdatingCheck || _updatingState == UpdatingDownload) { + Sandbox::stopUpdate(); + setUpdatingState(UpdatingFail); + } + _sendingState = SendingNone; + updateControls(); + } +} + +void LastCrashedWindow::onUpdateChecking() { + setUpdatingState(UpdatingCheck); +} + +void LastCrashedWindow::onUpdateLatest() { + setUpdatingState(UpdatingLatest); +} + +void LastCrashedWindow::onUpdateDownloading(qint64 ready, qint64 total) { + setUpdatingState(UpdatingDownload); + setDownloadProgress(ready, total); +} + +void LastCrashedWindow::onUpdateReady() { + setUpdatingState(UpdatingReady); +} + +void LastCrashedWindow::onUpdateFailed() { + setUpdatingState(UpdatingFail); +} +#endif // !TDESKTOP_DISABLE_AUTOUPDATE + +void LastCrashedWindow::onContinue() { + if (CrashReports::Restart() == CrashReports::CantOpen) { + new NotStartedWindow(); + } else if (!Global::started()) { + Sandbox::launch(); + } + close(); +} + +void LastCrashedWindow::onSendingError(QNetworkReply::NetworkError e) { + LOG(("Crash report sending error: %1").arg(e)); + + _pleaseSendReport.setText(qsl("Sending crash report failed :(")); + _sendingState = SendingFail; + if (_checkReply) { + _checkReply->deleteLater(); + _checkReply = nullptr; + } + if (_sendReply) { + _sendReply->deleteLater(); + _sendReply = nullptr; + } + updateControls(); +} + +void LastCrashedWindow::onSendingFinished() { + if (_sendReply) { + QByteArray result = _sendReply->readAll(); + LOG(("Crash report sending done, result: %1").arg(QString::fromUtf8(result))); + + _sendReply->deleteLater(); + _sendReply = nullptr; + _pleaseSendReport.setText(qsl("Thank you for your report!")); + _sendingState = SendingDone; + updateControls(); + + CrashReports::Restart(); + } +} + +void LastCrashedWindow::onSendingProgress(qint64 uploaded, qint64 total) { + if (_sendingState != SendingProgress && _sendingState != SendingUploading) return; + _sendingState = SendingUploading; + + if (total < 0) { + _pleaseSendReport.setText(qsl("Sending crash report %1 KB...").arg(uploaded / 1024)); + } else { + _pleaseSendReport.setText(qsl("Sending crash report %1 / %2 KB...").arg(uploaded / 1024).arg(total / 1024)); + } + updateControls(); +} + +void LastCrashedWindow::closeEvent(QCloseEvent *e) { + deleteLater(); +} + +void LastCrashedWindow::resizeEvent(QResizeEvent *e) { + int padding = _size; + _label.move(padding, padding + (_networkSettings.height() - _label.height()) / 2); + + _send.move(width() - padding - _send.width(), height() - padding - _send.height()); + if (_sendingState == SendingProgress || _sendingState == SendingUploading) { + _sendSkip.move(width() - padding - _sendSkip.width(), height() - padding - _sendSkip.height()); + } else { + _sendSkip.move(width() - padding - _send.width() - padding - _sendSkip.width(), height() - padding - _sendSkip.height()); + } + + _updating.move(padding, padding * 2 + _networkSettings.height() + (_networkSettings.height() - _updating.height()) / 2); + +#ifndef TDESKTOP_DISABLE_AUTOUPDATE + _pleaseSendReport.move(padding, padding * 2 + _networkSettings.height() + _networkSettings.height() + padding + (_showReport.height() - _pleaseSendReport.height()) / 2); + _showReport.move(padding * 2 + _pleaseSendReport.width(), padding * 2 + _networkSettings.height() + _networkSettings.height() + padding); + _yourReportName.move(padding, _showReport.y() + _showReport.height() + padding); + _includeUsername.move(padding, _yourReportName.y() + _yourReportName.height() + padding); + _getApp.move((width() - _getApp.width()) / 2, _showReport.y() + _showReport.height() + padding); + + if (_sendingState == SendingFail || _sendingState == SendingProgress) { + _networkSettings.move(padding * 2 + _pleaseSendReport.width(), padding * 2 + _networkSettings.height() + _networkSettings.height() + padding); + } else { + _networkSettings.move(padding * 2 + _updating.width(), padding * 2 + _networkSettings.height()); + } + + if (_updatingState == UpdatingCheck || _updatingState == UpdatingDownload) { + _updatingCheck.move(width() - padding - _updatingCheck.width(), height() - padding - _updatingCheck.height()); + _updatingSkip.move(width() - padding - _updatingSkip.width(), height() - padding - _updatingSkip.height()); + } else { + _updatingCheck.move(width() - padding - _updatingCheck.width(), height() - padding - _updatingCheck.height()); + _updatingSkip.move(width() - padding - _updatingCheck.width() - padding - _updatingSkip.width(), height() - padding - _updatingSkip.height()); + } +#else // !TDESKTOP_DISABLE_AUTOUPDATE + _getApp.move((width() - _getApp.width()) / 2, _updating.y() + _updating.height() + padding); + + _pleaseSendReport.move(padding, padding * 2 + _networkSettings.height() + _networkSettings.height() + padding + _getApp.height() + padding + (_showReport.height() - _pleaseSendReport.height()) / 2); + _showReport.move(padding * 2 + _pleaseSendReport.width(), padding * 2 + _networkSettings.height() + _networkSettings.height() + padding + _getApp.height() + padding); + _yourReportName.move(padding, _showReport.y() + _showReport.height() + padding); + _includeUsername.move(padding, _yourReportName.y() + _yourReportName.height() + padding); + + _networkSettings.move(padding * 2 + _pleaseSendReport.width(), padding * 2 + _networkSettings.height() + _networkSettings.height() + padding + _getApp.height() + padding); +#endif // else for !TDESKTOP_DISABLE_AUTOUPDATE + if (_reportUsername.isEmpty()) { + _report.setGeometry(padding, _yourReportName.y() + _yourReportName.height() + padding, width() - 2 * padding, _pleaseSendReport.height() * 12.5); + } else { + _report.setGeometry(padding, _includeUsername.y() + _includeUsername.height() + padding, width() - 2 * padding, _pleaseSendReport.height() * 12.5); + } + _minidump.move(padding, _report.y() + _report.height() + padding); + _saveReport.move(_showReport.x(), _showReport.y()); + + _continue.move(width() - padding - _continue.width(), height() - padding - _continue.height()); +} + +NetworkSettingsWindow::NetworkSettingsWindow(QWidget *parent, QString host, quint32 port, QString username, QString password) +: PreLaunchWindow(qsl("HTTP Proxy Settings")) +, _hostLabel(this) +, _portLabel(this) +, _usernameLabel(this) +, _passwordLabel(this) +, _hostInput(this) +, _portInput(this) +, _usernameInput(this) +, _passwordInput(this, true) +, _save(this) +, _cancel(this, false) +, _parent(parent) { + setWindowModality(Qt::ApplicationModal); + + _hostLabel.setText(qsl("Hostname")); + _portLabel.setText(qsl("Port")); + _usernameLabel.setText(qsl("Username")); + _passwordLabel.setText(qsl("Password")); + + _save.setText(qsl("SAVE")); + connect(&_save, SIGNAL(clicked()), this, SLOT(onSave())); + _cancel.setText(qsl("CANCEL")); + connect(&_cancel, SIGNAL(clicked()), this, SLOT(close())); + + _hostInput.setText(host); + _portInput.setText(QString::number(port)); + _usernameInput.setText(username); + _passwordInput.setText(password); + + QRect scr(QApplication::primaryScreen()->availableGeometry()); + move(scr.x() + (scr.width() / 6), scr.y() + (scr.height() / 6)); + updateControls(); + show(); + + _hostInput.setFocus(); + _hostInput.setCursorPosition(_hostInput.text().size()); +} + +void NetworkSettingsWindow::resizeEvent(QResizeEvent *e) { + int padding = _size; + _hostLabel.move(padding, padding); + _hostInput.setGeometry(_hostLabel.x(), _hostLabel.y() + _hostLabel.height(), 2 * _hostLabel.width(), _hostInput.height()); + _portLabel.move(padding + _hostInput.width() + padding, padding); + _portInput.setGeometry(_portLabel.x(), _portLabel.y() + _portLabel.height(), width() - padding - _portLabel.x(), _portInput.height()); + _usernameLabel.move(padding, _hostInput.y() + _hostInput.height() + padding); + _usernameInput.setGeometry(_usernameLabel.x(), _usernameLabel.y() + _usernameLabel.height(), (width() - 3 * padding) / 2, _usernameInput.height()); + _passwordLabel.move(padding + _usernameInput.width() + padding, _usernameLabel.y()); + _passwordInput.setGeometry(_passwordLabel.x(), _passwordLabel.y() + _passwordLabel.height(), width() - padding - _passwordLabel.x(), _passwordInput.height()); + + _save.move(width() - padding - _save.width(), height() - padding - _save.height()); + _cancel.move(_save.x() - padding - _cancel.width(), _save.y()); +} + +void NetworkSettingsWindow::onSave() { + QString host = _hostInput.text().trimmed(), port = _portInput.text().trimmed(), username = _usernameInput.text().trimmed(), password = _passwordInput.text().trimmed(); + if (!port.isEmpty() && !port.toUInt()) { + _portInput.setFocus(); + return; + } else if (!host.isEmpty() && port.isEmpty()) { + _portInput.setFocus(); + return; + } + emit saved(host, port.toUInt(), username, password); + close(); +} + +void NetworkSettingsWindow::closeEvent(QCloseEvent *e) { +} + +void NetworkSettingsWindow::updateControls() { + _hostInput.updateGeometry(); + _hostInput.resize(_hostInput.sizeHint()); + _portInput.updateGeometry(); + _portInput.resize(_portInput.sizeHint()); + _usernameInput.updateGeometry(); + _usernameInput.resize(_usernameInput.sizeHint()); + _passwordInput.updateGeometry(); + _passwordInput.resize(_passwordInput.sizeHint()); + + int padding = _size; + int w = 2 * padding + _hostLabel.width() * 2 + padding + _portLabel.width() * 2 + padding; + int h = padding + _hostLabel.height() + _hostInput.height() + padding + _usernameLabel.height() + _usernameInput.height() + padding + _save.height() + padding; + if (w == width() && h == height()) { + resizeEvent(0); + } else { + setGeometry(_parent->x() + (_parent->width() - w) / 2, _parent->y() + (_parent->height() - h) / 2, w, h); + } +} diff --git a/Telegram/SourceFiles/core/crash_report_window.h b/Telegram/SourceFiles/core/crash_report_window.h new file mode 100644 index 000000000..a5acd4c92 --- /dev/null +++ b/Telegram/SourceFiles/core/crash_report_window.h @@ -0,0 +1,226 @@ +/* +This file is part of Telegram Desktop, +the official desktop version of Telegram messaging app, see https://telegram.org + +Telegram Desktop is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +It is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +In addition, as a special exception, the copyright holders give permission +to link the code of portions of this program with the OpenSSL library. + +Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE +Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org +*/ +#pragma once + +class PreLaunchWindow : public QWidget { +public: + PreLaunchWindow(QString title = QString()); + void activate(); + int basicSize() const { + return _size; + } + ~PreLaunchWindow(); + + static PreLaunchWindow *instance(); + +protected: + + int _size; + +}; + +class PreLaunchLabel : public QLabel { +public: + PreLaunchLabel(QWidget *parent); + void setText(const QString &text); + +}; + +class PreLaunchInput : public QLineEdit { +public: + PreLaunchInput(QWidget *parent, bool password = false); + +}; + +class PreLaunchLog : public QTextEdit { +public: + PreLaunchLog(QWidget *parent); + +}; + +class PreLaunchButton : public QPushButton { +public: + PreLaunchButton(QWidget *parent, bool confirm = true); + void setText(const QString &text); + +}; + +class PreLaunchCheckbox : public QCheckBox { +public: + PreLaunchCheckbox(QWidget *parent); + void setText(const QString &text); + +}; + +class NotStartedWindow : public PreLaunchWindow { +public: + NotStartedWindow(); + +protected: + void closeEvent(QCloseEvent *e); + void resizeEvent(QResizeEvent *e); + +private: + void updateControls(); + + PreLaunchLabel _label; + PreLaunchLog _log; + PreLaunchButton _close; + +}; + +class LastCrashedWindow : public PreLaunchWindow { + Q_OBJECT + +public: + LastCrashedWindow(); + +public slots: + void onViewReport(); + void onSaveReport(); + void onSendReport(); + void onGetApp(); + + void onNetworkSettings(); + void onNetworkSettingsSaved(QString host, quint32 port, QString username, QString password); + void onContinue(); + + void onCheckingFinished(); + void onSendingError(QNetworkReply::NetworkError e); + void onSendingFinished(); + void onSendingProgress(qint64 uploaded, qint64 total); + +#ifndef TDESKTOP_DISABLE_AUTOUPDATE + void onUpdateRetry(); + void onUpdateSkip(); + + void onUpdateChecking(); + void onUpdateLatest(); + void onUpdateDownloading(qint64 ready, qint64 total); + void onUpdateReady(); + void onUpdateFailed(); +#endif // !TDESKTOP_DISABLE_AUTOUPDATE + +protected: + void closeEvent(QCloseEvent *e); + void resizeEvent(QResizeEvent *e); + +private: + QString minidumpFileName(); + void updateControls(); + + QString _host, _username, _password; + quint32 _port; + + PreLaunchLabel _label, _pleaseSendReport, _yourReportName, _minidump; + PreLaunchLog _report; + PreLaunchButton _send, _sendSkip, _networkSettings, _continue, _showReport, _saveReport, _getApp; + PreLaunchCheckbox _includeUsername; + + QString _minidumpName, _minidumpFull, _reportText; + QString _reportUsername, _reportTextNoUsername; + QByteArray getCrashReportRaw() const; + + bool _reportShown, _reportSaved; + + void excludeReportUsername(); + + enum SendingState { + SendingNoReport, + SendingUpdateCheck, + SendingNone, + SendingTooOld, + SendingTooMany, + SendingUnofficial, + SendingProgress, + SendingUploading, + SendingFail, + SendingDone, + }; + SendingState _sendingState; + + PreLaunchLabel _updating; + qint64 _sendingProgress, _sendingTotal; + + QNetworkAccessManager _sendManager; + QNetworkReply *_checkReply, *_sendReply; + +#ifndef TDESKTOP_DISABLE_AUTOUPDATE + PreLaunchButton _updatingCheck, _updatingSkip; + enum UpdatingState { + UpdatingNone, + UpdatingCheck, + UpdatingLatest, + UpdatingDownload, + UpdatingFail, + UpdatingReady + }; + UpdatingState _updatingState; + QString _newVersionDownload; + + void setUpdatingState(UpdatingState state, bool force = false); + void setDownloadProgress(qint64 ready, qint64 total); +#endif // !TDESKTOP_DISABLE_AUTOUPDATE + + QString getReportField(const QLatin1String &name, const QLatin1String &prefix); + void addReportFieldPart(const QLatin1String &name, const QLatin1String &prefix, QHttpMultiPart *multipart); + +}; + +class NetworkSettingsWindow : public PreLaunchWindow { + Q_OBJECT + +public: + NetworkSettingsWindow(QWidget *parent, QString host, quint32 port, QString username, QString password); + +signals: + void saved(QString host, quint32 port, QString username, QString password); + +public slots: + void onSave(); + +protected: + void closeEvent(QCloseEvent *e); + void resizeEvent(QResizeEvent *e); + +private: + void updateControls(); + + PreLaunchLabel _hostLabel, _portLabel, _usernameLabel, _passwordLabel; + PreLaunchInput _hostInput, _portInput, _usernameInput, _passwordInput; + PreLaunchButton _save, _cancel; + + QWidget *_parent; + +}; + +class ShowCrashReportWindow : public PreLaunchWindow { +public: + ShowCrashReportWindow(const QString &text); + +protected: + void resizeEvent(QResizeEvent *e); + void closeEvent(QCloseEvent *e); + +private: + PreLaunchLog _log; + +}; diff --git a/Telegram/SourceFiles/core/crash_reports.cpp b/Telegram/SourceFiles/core/crash_reports.cpp new file mode 100644 index 000000000..8f4e86525 --- /dev/null +++ b/Telegram/SourceFiles/core/crash_reports.cpp @@ -0,0 +1,576 @@ +/* +This file is part of Telegram Desktop, +the official desktop version of Telegram messaging app, see https://telegram.org + +Telegram Desktop is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +It is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +In addition, as a special exception, the copyright holders give permission +to link the code of portions of this program with the OpenSSL library. + +Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE +Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org +*/ +#include "core/crash_reports.h" + +#include "platform/platform_specific.h" + +#include +#include +#include + +#ifndef TDESKTOP_DISABLE_CRASH_REPORTS + +// see https://blog.inventic.eu/2012/08/qt-and-google-breakpad/ +#ifdef Q_OS_WIN + +#pragma warning(push) +#pragma warning(disable:4091) +#include "client/windows/handler/exception_handler.h" +#pragma warning(pop) + +#elif defined Q_OS_MAC // Q_OS_WIN + +#include +#include +#include +#include +#include + +#ifdef MAC_USE_BREAKPAD +#include "client/mac/handler/exception_handler.h" +#else // MAC_USE_BREAKPAD +#include "client/crashpad_client.h" +#endif // else for MAC_USE_BREAKPAD + +#elif defined Q_OS_LINUX64 || defined Q_OS_LINUX32 // Q_OS_MAC + +#include +#include +#include + +#include "client/linux/handler/exception_handler.h" + +#endif // Q_OS_LINUX64 || Q_OS_LINUX32 + +#endif // !TDESKTOP_DISABLE_CRASH_REPORTS + +namespace CrashReports { +namespace { + +using Annotations = std::map; +using AnnotationRefs = std::map; + +Annotations ProcessAnnotations; +AnnotationRefs ProcessAnnotationRefs; + +#ifndef TDESKTOP_DISABLE_CRASH_REPORTS + +QString ReportPath; +FILE *ReportFile = nullptr; +int ReportFileNo = 0; +char LaunchedDateTimeStr[32] = { 0 }; +char LaunchedBinaryName[256] = { 0 }; + +void SafeWriteChar(char ch) { + fwrite(&ch, 1, 1, ReportFile); +} + +template +struct writeNumberSignAndRemoveIt { + static void call(Type &number) { + if (number < 0) { + SafeWriteChar('-'); + number = -number; + } + } +}; +template +struct writeNumberSignAndRemoveIt { + static void call(Type &number) { + } +}; + +template +const dump &SafeWriteNumber(const dump &stream, Type number) { + if (!ReportFile) return stream; + + writeNumberSignAndRemoveIt<(Type(-1) > Type(0)), Type>::call(number); + Type upper = 1, prev = number / 10; + while (prev >= upper) { + upper *= 10; + } + while (upper > 0) { + int digit = (number / upper); + SafeWriteChar('0' + digit); + number -= digit * upper; + upper /= 10; + } + return stream; +} + +using ReservedMemoryChunk = std::array; +std::unique_ptr ReservedMemory; + +void InstallOperatorNewHandler() { + ReservedMemory = std::make_unique(); + std::set_new_handler([] { + std::set_new_handler(nullptr); + ReservedMemory.reset(); + Unexpected("Could not allocate!"); + }); +} + +Qt::HANDLE ReportingThreadId = nullptr; +bool ReportingHeaderWritten = false; +QMutex ReportingMutex; + +const char *BreakpadDumpPath = nullptr; +const wchar_t *BreakpadDumpPathW = nullptr; + +#if defined Q_OS_MAC || defined Q_OS_LINUX32 || defined Q_OS_LINUX64 +struct sigaction SIG_def[32]; + +void SignalHandler(int signum, siginfo_t *info, void *ucontext) { + if (signum > 0) { + sigaction(signum, &SIG_def[signum], 0); + } + +#else // Q_OS_MAC || Q_OS_LINUX32 || Q_OS_LINUX64 +void SignalHandler(int signum) { +#endif // else for Q_OS_MAC || Q_OS_LINUX || Q_OS_LINUX64 + + const char* name = 0; + switch (signum) { + case SIGABRT: name = "SIGABRT"; break; + case SIGSEGV: name = "SIGSEGV"; break; + case SIGILL: name = "SIGILL"; break; + case SIGFPE: name = "SIGFPE"; break; +#ifndef Q_OS_WIN + case SIGBUS: name = "SIGBUS"; break; + case SIGSYS: name = "SIGSYS"; break; +#endif // !Q_OS_WIN + } + + Qt::HANDLE thread = QThread::currentThreadId(); + if (thread == ReportingThreadId) return; + + QMutexLocker lock(&ReportingMutex); + ReportingThreadId = thread; + + if (!ReportingHeaderWritten) { + ReportingHeaderWritten = true; + auto dec2hex = [](int value) -> char { + if (value >= 0 && value < 10) { + return '0' + value; + } else if (value >= 10 && value < 16) { + return 'a' + (value - 10); + } + return '#'; + }; + + for (const auto &i : ProcessAnnotationRefs) { + QByteArray utf8 = i.second->toUtf8(); + std::string wrapped; + wrapped.reserve(4 * utf8.size()); + for (auto ch : utf8) { + auto uch = static_cast(ch); + wrapped.append("\\x", 2).append(1, dec2hex(uch >> 4)).append(1, dec2hex(uch & 0x0F)); + } + ProcessAnnotations[i.first] = wrapped; + } + + const Annotations c_ProcessAnnotations(ProcessAnnotations); + for (const auto &i : c_ProcessAnnotations) { + dump() << i.first.c_str() << ": " << i.second.c_str() << "\n"; + } + psWriteDump(); + dump() << "\n"; + } + if (name) { + dump() << "Caught signal " << signum << " (" << name << ") in thread " << uint64(thread) << "\n"; + } else if (signum == -1) { + dump() << "Google Breakpad caught a crash, minidump written in thread " << uint64(thread) << "\n"; + if (BreakpadDumpPath) { + dump() << "Minidump: " << BreakpadDumpPath << "\n"; + } else if (BreakpadDumpPathW) { + dump() << "Minidump: " << BreakpadDumpPathW << "\n"; + } + } else { + dump() << "Caught signal " << signum << " in thread " << uint64(thread) << "\n"; + } + + // see https://github.com/benbjohnson/bandicoot +#if defined Q_OS_MAC || defined Q_OS_LINUX32 || defined Q_OS_LINUX64 + ucontext_t *uc = (ucontext_t*)ucontext; + + void *caller = 0; + if (uc) { +#if defined(__APPLE__) && !defined(MAC_OS_X_VERSION_10_6) + /* OSX < 10.6 */ +#if defined(__x86_64__) + caller = (void*)uc->uc_mcontext->__ss.__rip; +#elif defined(__i386__) + caller = (void*)uc->uc_mcontext->__ss.__eip; +#else + caller = (void*)uc->uc_mcontext->__ss.__srr0; +#endif +#elif defined(__APPLE__) && defined(MAC_OS_X_VERSION_10_6) + /* OSX >= 10.6 */ +#if defined(_STRUCT_X86_THREAD_STATE64) && !defined(__i386__) + caller = (void*)uc->uc_mcontext->__ss.__rip; +#else + caller = (void*)uc->uc_mcontext->__ss.__eip; +#endif +#elif defined(__linux__) + /* Linux */ +#if defined(__i386__) + caller = (void*)uc->uc_mcontext.gregs[14]; /* Linux 32 */ +#elif defined(__X86_64__) || defined(__x86_64__) + caller = (void*)uc->uc_mcontext.gregs[16]; /* Linux 64 */ +#elif defined(__ia64__) /* Linux IA64 */ + caller = (void*)uc->uc_mcontext.sc_ip; +#endif + +#endif + } + + void *addresses[132] = { 0 }; + size_t size = backtrace(addresses, 128); + + /* overwrite sigaction with caller's address */ + if (caller) { + for (int i = size; i > 1; --i) { + addresses[i + 3] = addresses[i]; + } + addresses[2] = (void*)0x1; + addresses[3] = caller; + addresses[4] = (void*)0x1; + } + +#ifdef Q_OS_MAC + dump() << "\nBase image addresses:\n"; + for (size_t i = 0; i < size; ++i) { + Dl_info info; + dump() << i << " "; + if (dladdr(addresses[i], &info)) { + dump() << uint64(info.dli_fbase) << " (" << info.dli_fname << ")\n"; + } else { + dump() << "_unknown_module_\n"; + } + } +#endif // Q_OS_MAC + + dump() << "\nBacktrace:\n"; + + backtrace_symbols_fd(addresses, size, ReportFileNo); + +#else // Q_OS_MAC || Q_OS_LINUX32 || Q_OS_LINUX64 + dump() << "\nBacktrace:\n"; + + psWriteStackTrace(); +#endif // else for Q_OS_MAC || Q_OS_LINUX32 || Q_OS_LINUX64 + + dump() << "\n"; + + ReportingThreadId = nullptr; +} + +bool SetSignalHandlers = true; +bool CrashLogged = false; +#if !defined Q_OS_MAC || defined MAC_USE_BREAKPAD +google_breakpad::ExceptionHandler* BreakpadExceptionHandler = 0; + +#ifdef Q_OS_WIN +bool DumpCallback(const wchar_t* _dump_dir, const wchar_t* _minidump_id, void* context, EXCEPTION_POINTERS* exinfo, MDRawAssertionInfo* assertion, bool success) +#elif defined Q_OS_MAC // Q_OS_WIN +bool DumpCallback(const char* _dump_dir, const char* _minidump_id, void *context, bool success) +#elif defined Q_OS_LINUX64 || defined Q_OS_LINUX32 // Q_OS_MAC +bool DumpCallback(const google_breakpad::MinidumpDescriptor &md, void *context, bool success) +#endif // Q_OS_LINUX64 || Q_OS_LINUX32 +{ + if (CrashLogged) return success; + CrashLogged = true; + +#ifdef Q_OS_WIN + BreakpadDumpPathW = _minidump_id; + SignalHandler(-1); +#else // Q_OS_WIN + +#ifdef Q_OS_MAC + BreakpadDumpPath = _minidump_id; +#else // Q_OS_MAC + BreakpadDumpPath = md.path(); +#endif // else for Q_OS_MAC + SignalHandler(-1, 0, 0); +#endif // else for Q_OS_WIN + return success; +} +#endif // !Q_OS_MAC || MAC_USE_BREAKPAD + +#endif // !TDESKTOP_DISABLE_CRASH_REPORTS + +} // namespace + +void StartCatching() { +#ifndef TDESKTOP_DISABLE_CRASH_REPORTS + ProcessAnnotations["Binary"] = cExeName().toUtf8().constData(); + ProcessAnnotations["ApiId"] = QString::number(ApiId).toUtf8().constData(); + ProcessAnnotations["Version"] = (cBetaVersion() ? qsl("%1 beta").arg(cBetaVersion()) : (cAlphaVersion() ? qsl("%1 alpha") : qsl("%1")).arg(AppVersion)).toUtf8().constData(); + ProcessAnnotations["Launched"] = QDateTime::currentDateTime().toString("dd.MM.yyyy hh:mm:ss").toUtf8().constData(); + ProcessAnnotations["Platform"] = cPlatformString().toUtf8().constData(); + ProcessAnnotations["UserTag"] = QString::number(Sandbox::UserTag(), 16).toUtf8().constData(); + + QString dumpspath = cWorkingDir() + qsl("tdata/dumps"); + QDir().mkpath(dumpspath); + +#ifdef Q_OS_WIN + BreakpadExceptionHandler = new google_breakpad::ExceptionHandler( + dumpspath.toStdWString(), + google_breakpad::ExceptionHandler::FilterCallback(nullptr), + DumpCallback, + (void*)nullptr, // callback_context + google_breakpad::ExceptionHandler::HANDLER_ALL, + MINIDUMP_TYPE(MiniDumpNormal), + // MINIDUMP_TYPE(MiniDumpWithFullMemory | MiniDumpWithHandleData | MiniDumpWithThreadInfo | MiniDumpWithProcessThreadData | MiniDumpWithFullMemoryInfo | MiniDumpWithUnloadedModules | MiniDumpWithFullAuxiliaryState | MiniDumpIgnoreInaccessibleMemory | MiniDumpWithTokenInformation), + (const wchar_t*)nullptr, // pipe_name + (const google_breakpad::CustomClientInfo*)nullptr + ); +#elif defined Q_OS_MAC // Q_OS_WIN + +#ifdef MAC_USE_BREAKPAD +#ifndef _DEBUG + BreakpadExceptionHandler = new google_breakpad::ExceptionHandler( + QFile::encodeName(dumpspath).toStdString(), + /*FilterCallback*/ 0, + DumpCallback, + /*context*/ 0, + true, + 0 + ); +#endif // !_DEBUG + SetSignalHandlers = false; +#else // MAC_USE_BREAKPAD + crashpad::CrashpadClient crashpad_client; + std::string handler = (cExeDir() + cExeName() + qsl("/Contents/Helpers/crashpad_handler")).toUtf8().constData(); + std::string database = QFile::encodeName(dumpspath).constData(); + if (crashpad_client.StartHandler(base::FilePath(handler), + base::FilePath(database), + std::string(), + ProcessAnnotations, + std::vector(), + false)) { + crashpad_client.UseHandler(); + } +#endif // else for MAC_USE_BREAKPAD +#elif defined Q_OS_LINUX64 || defined Q_OS_LINUX32 + BreakpadExceptionHandler = new google_breakpad::ExceptionHandler( + google_breakpad::MinidumpDescriptor(QFile::encodeName(dumpspath).toStdString()), + /*FilterCallback*/ 0, + DumpCallback, + /*context*/ 0, + true, + -1 + ); +#endif // Q_OS_LINUX64 || Q_OS_LINUX32 +#endif // !TDESKTOP_DISABLE_CRASH_REPORTS +} + +void FinishCatching() { +#ifndef TDESKTOP_DISABLE_CRASH_REPORTS +#if !defined Q_OS_MAC || defined MAC_USE_BREAKPAD + + delete base::take(BreakpadExceptionHandler); + +#endif // !Q_OS_MAC || MAC_USE_BREAKPAD +#endif // !TDESKTOP_DISABLE_CRASH_REPORTS +} + +Status Start() { +#ifndef TDESKTOP_DISABLE_CRASH_REPORTS + ReportPath = cWorkingDir() + qsl("tdata/working"); + +#ifdef Q_OS_WIN + FILE *f = nullptr; + if (_wfopen_s(&f, ReportPath.toStdWString().c_str(), L"rb") != 0) { + f = nullptr; + } else { +#else // !Q_OS_WIN + if (FILE *f = fopen(QFile::encodeName(ReportPath).constData(), "rb")) { +#endif // else for !Q_OS_WIN + QByteArray lastdump; + char buffer[256 * 1024] = { 0 }; + int32 read = fread(buffer, 1, 256 * 1024, f); + if (read > 0) { + lastdump.append(buffer, read); + } + fclose(f); + + Sandbox::SetLastCrashDump(lastdump); + + LOG(("Opened '%1' for reading, the previous Telegram Desktop launch was not finished properly :( Crash log size: %2").arg(ReportPath).arg(lastdump.size())); + + return LastCrashed; + } + +#endif // !TDESKTOP_DISABLE_CRASH_REPORTS + return Restart(); +} + +Status Restart() { +#ifndef TDESKTOP_DISABLE_CRASH_REPORTS + if (ReportFile) { + return Started; + } + +#ifdef Q_OS_WIN + if (_wfopen_s(&ReportFile, ReportPath.toStdWString().c_str(), L"wb") != 0) { + ReportFile = nullptr; + } +#else // Q_OS_WIN + ReportFile = fopen(QFile::encodeName(ReportPath).constData(), "wb"); +#endif // else for Q_OS_WIN + if (ReportFile) { +#ifdef Q_OS_WIN + ReportFileNo = _fileno(ReportFile); +#else // Q_OS_WIN + ReportFileNo = fileno(ReportFile); +#endif // else for Q_OS_WIN + if (SetSignalHandlers) { +#ifndef Q_OS_WIN + struct sigaction sigact; + + sigact.sa_sigaction = SignalHandler; + sigemptyset(&sigact.sa_mask); + sigact.sa_flags = SA_NODEFER | SA_RESETHAND | SA_SIGINFO; + + sigaction(SIGABRT, &sigact, &SIG_def[SIGABRT]); + sigaction(SIGSEGV, &sigact, &SIG_def[SIGSEGV]); + sigaction(SIGILL, &sigact, &SIG_def[SIGILL]); + sigaction(SIGFPE, &sigact, &SIG_def[SIGFPE]); + sigaction(SIGBUS, &sigact, &SIG_def[SIGBUS]); + sigaction(SIGSYS, &sigact, &SIG_def[SIGSYS]); +#else // !Q_OS_WIN + signal(SIGABRT, SignalHandler); + signal(SIGSEGV, SignalHandler); + signal(SIGILL, SignalHandler); + signal(SIGFPE, SignalHandler); +#endif // else for !Q_OS_WIN + } + + InstallOperatorNewHandler(); + + return Started; + } + + LOG(("FATAL: Could not open '%1' for writing!").arg(ReportPath)); + + return CantOpen; +#else // !TDESKTOP_DISABLE_CRASH_REPORTS + return Started; +#endif // else for !TDESKTOP_DISABLE_CRASH_REPORTS +} + +void Finish() { +#ifndef TDESKTOP_DISABLE_CRASH_REPORTS + FinishCatching(); + + if (ReportFile) { + fclose(ReportFile); + ReportFile = nullptr; + +#ifdef Q_OS_WIN + _wunlink(ReportPath.toStdWString().c_str()); +#else // Q_OS_WIN + unlink(ReportPath.toUtf8().constData()); +#endif // else for Q_OS_WIN + } +#endif // !TDESKTOP_DISABLE_CRASH_REPORTS +} + +void SetAnnotation(const std::string &key, const QString &value) { + static QMutex mutex; + QMutexLocker lock(&mutex); + + if (!value.trimmed().isEmpty()) { + ProcessAnnotations[key] = value.toUtf8().constData(); + } else { + ProcessAnnotations.erase(key); + } +} + +void SetAnnotationRef(const std::string &key, const QString *valuePtr) { + if (valuePtr) { + ProcessAnnotationRefs[key] = valuePtr; + } else { + ProcessAnnotationRefs.erase(key); + } +} + +dump::~dump() { + if (ReportFile) { + fflush(ReportFile); + } +} + +const dump &operator<<(const dump &stream, const char *str) { + if (!ReportFile) return stream; + + fwrite(str, 1, strlen(str), ReportFile); + return stream; +} + +const dump &operator<<(const dump &stream, const wchar_t *str) { + if (!ReportFile) return stream; + + for (int i = 0, l = wcslen(str); i < l; ++i) { + if (str[i] >= 0 && str[i] < 128) { + SafeWriteChar(char(str[i])); + } else { + SafeWriteChar('?'); + } + } + return stream; +} + +const dump &operator<<(const dump &stream, int num) { + return SafeWriteNumber(stream, num); +} + +const dump &operator<<(const dump &stream, unsigned int num) { + return SafeWriteNumber(stream, num); +} + +const dump &operator<<(const dump &stream, unsigned long num) { + return SafeWriteNumber(stream, num); +} + +const dump &operator<<(const dump &stream, unsigned long long num) { + return SafeWriteNumber(stream, num); +} + +const dump &operator<<(const dump &stream, double num) { + if (num < 0) { + SafeWriteChar('-'); + num = -num; + } + SafeWriteNumber(stream, uint64(floor(num))); + SafeWriteChar('.'); + num -= floor(num); + for (int i = 0; i < 4; ++i) { + num *= 10; + int digit = int(floor(num)); + SafeWriteChar('0' + digit); + num -= digit; + } + return stream; +} + +} // namespace CrashReports diff --git a/Telegram/SourceFiles/core/crash_reports.h b/Telegram/SourceFiles/core/crash_reports.h new file mode 100644 index 000000000..392ca0a2f --- /dev/null +++ b/Telegram/SourceFiles/core/crash_reports.h @@ -0,0 +1,81 @@ +/* +This file is part of Telegram Desktop, +the official desktop version of Telegram messaging app, see https://telegram.org + +Telegram Desktop is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +It is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +In addition, as a special exception, the copyright holders give permission +to link the code of portions of this program with the OpenSSL library. + +Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE +Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org +*/ +#pragma once + +namespace CrashReports { + +struct dump { + ~dump(); +}; +const dump &operator<<(const dump &stream, const char *str); +const dump &operator<<(const dump &stream, const wchar_t *str); +const dump &operator<<(const dump &stream, int num); +const dump &operator<<(const dump &stream, unsigned int num); +const dump &operator<<(const dump &stream, unsigned long num); +const dump &operator<<(const dump &stream, unsigned long long num); +const dump &operator<<(const dump &stream, double num); + +enum Status { + CantOpen, + LastCrashed, + Started +}; +Status Start(); +Status Restart(); // can be only CantOpen or Started +void Finish(); + +void SetAnnotation(const std::string &key, const QString &value); +inline void ClearAnnotation(const std::string &key) { + SetAnnotation(key, QString()); +} + +// Remembers value pointer and tries to add the value to the crash report. +// Attention! You should call clearCrashAnnotationRef(key) before destroying value. +void SetAnnotationRef(const std::string &key, const QString *valuePtr); +inline void ClearAnnotationRef(const std::string &key) { + SetAnnotationRef(key, nullptr); +} + +void StartCatching(); +void FinishCatching(); + +} // namespace CrashReports + +namespace base { +namespace assertion { + +inline void log(const char *message, const char *file, int line) { + const auto info = QStringLiteral("%1 %2:%3" + ).arg(message + ).arg(file + ).arg(line + ); + const auto entry = QStringLiteral("Assertion Failed! ") + info; + +#ifdef LOG + LOG((entry)); +#endif // LOG + + CrashReports::SetAnnotation("Assertion", info); +} + +} // namespace assertion +} // namespace base diff --git a/Telegram/SourceFiles/core/launcher.cpp b/Telegram/SourceFiles/core/launcher.cpp new file mode 100644 index 000000000..cca4c4c22 --- /dev/null +++ b/Telegram/SourceFiles/core/launcher.cpp @@ -0,0 +1,106 @@ +/* +This file is part of Telegram Desktop, +the official desktop version of Telegram messaging app, see https://telegram.org + +Telegram Desktop is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +It is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +In addition, as a special exception, the copyright holders give permission +to link the code of portions of this program with the OpenSSL library. + +Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE +Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org +*/ +#include "core/launcher.h" + +#include "platform/platform_launcher.h" +#include "platform/platform_specific.h" +#include "core/crash_reports.h" +#include "application.h" + +namespace Core { +namespace { + +QStringList ReadArguments(int argc, char *argv[]) { + auto result = QStringList(); + result.reserve(argc); + for (auto i = 0; i != argc; ++i) { + result.push_back(fromUtf8Safe(argv[i])); + } + return result; +} + +} // namespace + +std::unique_ptr Launcher::Create(int argc, char *argv[]) { + return std::make_unique(argc, argv); +} + +Launcher::Launcher(int argc, char *argv[]) +: _argc(argc) +, _argv(argv) +, _arguments(ReadArguments(argc, argv)) { + InitFromCommandLine(argc, argv); +} + +void Launcher::init() { + QCoreApplication::setApplicationName(qsl("TelegramDesktop")); + +#ifndef OS_MAC_OLD + QCoreApplication::setAttribute(Qt::AA_DisableHighDpiScaling, true); +#endif // OS_MAC_OLD + + initHook(); +} + +int Launcher::exec() { + init(); + + if (cLaunchMode() == LaunchModeFixPrevious) { + return psFixPrevious(); + } else if (cLaunchMode() == LaunchModeCleanup) { + return psCleanup(); + } + + // both are finished in Application::closeApplication + Logs::start(this); // must be started before Platform is started + Platform::start(); // must be started before QApplication is created + + auto result = 0; + { + Application app(this, _argc, _argv); + result = app.exec(); + } + + DEBUG_LOG(("Telegram finished, result: %1").arg(result)); + +#ifndef TDESKTOP_DISABLE_AUTOUPDATE + if (cRestartingUpdate()) { + DEBUG_LOG(("Application Info: executing updater to install update...")); + psExecUpdater(); + } else +#endif // !TDESKTOP_DISABLE_AUTOUPDATE + if (cRestarting()) { + DEBUG_LOG(("Application Info: executing Telegram, because of restart...")); + psExecTelegram(); + } + + CrashReports::Finish(); + Platform::finish(); + Logs::finish(); + + return result; +} + +QString Launcher::argumentsString() const { + return _arguments.join(' '); +} + +} // namespace Core diff --git a/Telegram/SourceFiles/core/launcher.h b/Telegram/SourceFiles/core/launcher.h new file mode 100644 index 000000000..a0c03197b --- /dev/null +++ b/Telegram/SourceFiles/core/launcher.h @@ -0,0 +1,45 @@ +/* +This file is part of Telegram Desktop, +the official desktop version of Telegram messaging app, see https://telegram.org + +Telegram Desktop is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +It is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +In addition, as a special exception, the copyright holders give permission +to link the code of portions of this program with the OpenSSL library. + +Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE +Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org +*/ +#pragma once + +namespace Core { + +class Launcher { +public: + Launcher(int argc, char *argv[]); + + static std::unique_ptr Create(int argc, char *argv[]); + + int exec(); + + QString argumentsString() const; + +private: + void init(); + virtual void initHook() = 0; + + int _argc; + char **_argv; + QStringList _arguments; + +}; + +} // namespace Core diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp index bc2ac3f5b..178e34638 100644 --- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp +++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp @@ -36,6 +36,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "apiwrap.h" #include "window/themes/window_theme.h" #include "observer_peer.h" +#include "chat_helpers/stickers.h" #include "auth_session.h" #include "window/notifications_manager.h" #include "window/window_controller.h" @@ -2123,7 +2124,7 @@ void DialogsInner::saveRecentHashtags(const QString &text) { recent = cRecentSearchHashtags(); } found = true; - incrementRecentHashtag(recent, text.mid(i + 1, next - i - 1)); + Stickers::IncrementRecentHashtag(recent, text.mid(i + 1, next - i - 1)); } if (found) { cSetRecentSearchHashtags(recent); diff --git a/Telegram/SourceFiles/history/history.cpp b/Telegram/SourceFiles/history/history.cpp index 73a08afc8..4749e219c 100644 --- a/Telegram/SourceFiles/history/history.cpp +++ b/Telegram/SourceFiles/history/history.cpp @@ -38,6 +38,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "storage/storage_facade.h" #include "storage/storage_shared_media.h" #include "data/data_channel_admins.h" +#include "core/crash_reports.h" namespace { @@ -1499,7 +1500,7 @@ void History::addToSharedMedia(std::vector (&medias)[kSharedMediaTypeCoun } value.push_back(indices.join(",")); } - SignalHandlers::setCrashAnnotation("full", value.join(";")); + CrashReports::SetAnnotation("full", value.join(";")); Assert(!"History desync caught!"); //// Logging @@ -1631,11 +1632,11 @@ void History::addOlderSlice(const QVector &slice) { logged.push_back(QString::number(minAdded)); logged.push_back(QString::number(maxAdded)); - SignalHandlers::setCrashAnnotation("old_minmaxwas_minmaxadd", logged.join(";")); + CrashReports::SetAnnotation("old_minmaxwas_minmaxadd", logged.join(";")); addBlockToSharedMedia(block); - SignalHandlers::setCrashAnnotation("old_minmaxwas_minmaxadd", ""); + CrashReports::ClearAnnotation("old_minmaxwas_minmaxadd"); if (isChannel()) { asChannelHistory()->checkJoinedMessage(); @@ -1693,7 +1694,7 @@ void History::addNewerSlice(const QVector &slice) { } logged.push_back(QString::number(minAdded)); logged.push_back(QString::number(maxAdded)); - SignalHandlers::setCrashAnnotation("new_minmaxwas_minmaxadd", logged.join(";")); + CrashReports::SetAnnotation("new_minmaxwas_minmaxadd", logged.join(";")); if (!atLeastOneAdded) { newLoaded = true; @@ -1701,7 +1702,7 @@ void History::addNewerSlice(const QVector &slice) { } addToSharedMedia(medias, wasLoadedAtBottom != loadedAtBottom()); - SignalHandlers::setCrashAnnotation("new_minmaxwas_minmaxadd", ""); + CrashReports::ClearAnnotation("new_minmaxwas_minmaxadd"); } if (!wasLoadedAtBottom) { diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp index f782ae05e..3715cac84 100644 --- a/Telegram/SourceFiles/history/history_widget.cpp +++ b/Telegram/SourceFiles/history/history_widget.cpp @@ -79,6 +79,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "window/window_peer_menu.h" #include "inline_bots/inline_results_widget.h" #include "chat_helpers/emoji_suggestions_widget.h" +#include "core/crash_reports.h" namespace { @@ -2292,7 +2293,7 @@ void HistoryWidget::messagesReceived(PeerData *peer, const MTPmessages_Messages if (_preloadRequest == requestId) { auto to = toMigrated ? _migrated : _history; if (cBetaVersion()) { - SignalHandlers::setCrashAnnotation("old_debugstr", QString( + CrashReports::SetAnnotation("old_debugstr", QString( "%1_%2_%3_%4:%5_%6 (%7)" ).arg(PeerString(_debug_preloadDownPeer) ).arg(_debug_preloadOffsetId @@ -2307,7 +2308,7 @@ void HistoryWidget::messagesReceived(PeerData *peer, const MTPmessages_Messages addMessagesToFront(peer, *histList); if (cBetaVersion()) { - SignalHandlers::setCrashAnnotation("old_debugstr", QString()); + CrashReports::ClearAnnotation("old_debugstr"); } _preloadRequest = 0; @@ -2319,7 +2320,7 @@ void HistoryWidget::messagesReceived(PeerData *peer, const MTPmessages_Messages } else if (_preloadDownRequest == requestId) { auto to = toMigrated ? _migrated : _history; if (cBetaVersion()) { - SignalHandlers::setCrashAnnotation("new_debugstr", QString( + CrashReports::SetAnnotation("new_debugstr", QString( "%1_%2_%3_%4:%5_%6 (%7)" ).arg(PeerString(_debug_preloadDownPeer) ).arg(_debug_preloadDownOffsetId @@ -2334,7 +2335,7 @@ void HistoryWidget::messagesReceived(PeerData *peer, const MTPmessages_Messages addMessagesToBack(peer, *histList); if (cBetaVersion()) { - SignalHandlers::setCrashAnnotation("new_debugstr", QString()); + CrashReports::ClearAnnotation("new_debugstr"); } _preloadDownRequest = 0; diff --git a/Telegram/SourceFiles/logs.cpp b/Telegram/SourceFiles/logs.cpp index b344ae046..033b679f2 100644 --- a/Telegram/SourceFiles/logs.cpp +++ b/Telegram/SourceFiles/logs.cpp @@ -20,37 +20,10 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #include "logs.h" -#include -#include -#include - #include "platform/platform_specific.h" #include "mtproto/connection.h" - -#ifndef TDESKTOP_DISABLE_CRASH_REPORTS - -// see https://blog.inventic.eu/2012/08/qt-and-google-breakpad/ -#ifdef Q_OS_WIN - -#pragma warning(push) -#pragma warning(disable:4091) -#include "client/windows/handler/exception_handler.h" -#pragma warning(pop) - -#elif defined Q_OS_MAC // Q_OS_WIN - -#include -#ifdef MAC_USE_BREAKPAD -#include "client/mac/handler/exception_handler.h" -#else // MAC_USE_BREAKPAD -#include "client/crashpad_client.h" -#endif // else for MAC_USE_BREAKPAD - -#elif defined Q_OS_LINUX64 || defined Q_OS_LINUX32 // Q_OS_MAC -#include "client/linux/handler/exception_handler.h" -#endif // Q_OS_LINUX64 || Q_OS_LINUX32 - -#endif // !TDESKTOP_DISABLE_CRASH_REPORTS +#include "core/crash_reports.h" +#include "core/launcher.h" enum LogDataType { LogDataMain, @@ -292,293 +265,10 @@ void _logsWrite(LogDataType type, const QString &msg) { } } -void _moveOldDataFiles(const QString &from); - -namespace SignalHandlers { - void StartCrashHandler(); - void FinishCrashHandler(); -} - namespace Logs { +namespace { - void start() { - Assert(LogsData == 0); - - if (!Sandbox::CheckBetaVersionDir()) { - return; - } - - auto initialWorkingDir = QDir(cWorkingDir()).absolutePath() + '/'; - auto moveOldDataFrom = QString(); - auto workingDirChosen = false; - - if (cBetaVersion()) { - cSetDebug(true); - workingDirChosen = true; -#if defined Q_OS_MAC || defined Q_OS_LINUX - } else { -#ifdef _DEBUG - cForceWorkingDir(cExeDir()); -#else // _DEBUG - if (!cWorkingDir().isEmpty()) { - // This value must come only from the "-workdir" argument. - cForceWorkingDir(cWorkingDir()); - } else { - cForceWorkingDir(psAppDataPath()); - } -#endif // !_DEBUG - workingDirChosen = true; - -#if defined Q_OS_LINUX && !defined _DEBUG // fix first version - moveOldDataFrom = initialWorkingDir; -#endif // Q_OS_LINUX && !_DEBUG - -#elif defined Q_OS_WINRT // Q_OS_MAC || Q_OS_LINUX - } else { - cForceWorkingDir(psAppDataPath()); - workingDirChosen = true; -#elif defined OS_WIN_STORE // Q_OS_MAC || Q_OS_LINUX || Q_OS_WINRT -#ifdef _DEBUG - cForceWorkingDir(cExeDir()); -#else // _DEBUG - cForceWorkingDir(psAppDataPath()); -#endif // !_DEBUG - workingDirChosen = true; -#elif defined Q_OS_WIN - } else { - if (!cWorkingDir().isEmpty()) { - // This value must come only from the "-workdir" argument. - cForceWorkingDir(cWorkingDir()); - workingDirChosen = true; - } -#endif // Q_OS_MAC || Q_OS_LINUX || Q_OS_WINRT || OS_WIN_STORE - } - - LogsData = new LogsDataFields(); - if (!workingDirChosen) { - cForceWorkingDir(cExeDir()); - if (!LogsData->openMain()) { - cForceWorkingDir(psAppDataPath()); - } - } - - cForceWorkingDir(QDir(cWorkingDir()).absolutePath() + '/'); - -// WinRT build requires the working dir to stay the same for plugin loading. -#ifndef Q_OS_WINRT - QDir().setCurrent(cWorkingDir()); -#endif // !Q_OS_WINRT - - QDir().mkpath(cWorkingDir() + qstr("tdata")); - - Sandbox::WorkingDirReady(); - SignalHandlers::StartCrashHandler(); - - if (!LogsData->openMain()) { - delete LogsData; - LogsData = 0; - } - - LOG(("Launched version: %1, alpha: %2, beta: %3, debug mode: %4, test dc: %5").arg(AppVersion).arg(Logs::b(cAlphaVersion())).arg(cBetaVersion()).arg(Logs::b(cDebug())).arg(Logs::b(cTestMode()))); - LOG(("Executable dir: %1, name: %2").arg(cExeDir()).arg(cExeName())); - LOG(("Initial working dir: %1").arg(initialWorkingDir)); - LOG(("Working dir: %1").arg(cWorkingDir())); - LOG(("Command line: %1").arg(cArguments())); - - if (!LogsData) { - LOG(("FATAL: Could not open '%1' for writing log!").arg(_logsFilePath(LogDataMain, qsl("_startXX")))); - return; - } - -#ifdef Q_OS_WIN - if (cWorkingDir() == psAppDataPath()) { // fix old "Telegram Win (Unofficial)" version - moveOldDataFrom = psAppDataPathOld(); - } -#endif - if (!moveOldDataFrom.isEmpty()) { - _moveOldDataFiles(moveOldDataFrom); - } - - if (LogsInMemory) { - Assert(LogsInMemory != DeletedLogsInMemory); - LogsInMemoryList list = *LogsInMemory; - for (LogsInMemoryList::const_iterator i = list.cbegin(), e = list.cend(); i != e; ++i) { - if (i->first == LogDataMain) { - _logsWrite(i->first, i->second); - } - } - } - - LOG(("Logs started")); - } - - void finish() { - delete LogsData; - LogsData = 0; - - if (LogsInMemory && LogsInMemory != DeletedLogsInMemory) { - delete LogsInMemory; - } - LogsInMemory = DeletedLogsInMemory; - - _logsMutex(LogDataMain, true); - - SignalHandlers::FinishCrashHandler(); - } - - bool started() { - return LogsData != 0; - } - - bool instanceChecked() { - if (!LogsData) return false; - - if (!LogsData->instanceChecked()) { - LogsBeforeSingleInstanceChecked = Logs::full(); - - delete LogsData; - LogsData = 0; - LOG(("FATAL: Could not move logging to '%1'!").arg(_logsFilePath(LogDataMain))); - return false; - } - - if (LogsInMemory) { - Assert(LogsInMemory != DeletedLogsInMemory); - LogsInMemoryList list = *LogsInMemory; - for (LogsInMemoryList::const_iterator i = list.cbegin(), e = list.cend(); i != e; ++i) { - if (i->first != LogDataMain) { - _logsWrite(i->first, i->second); - } - } - } - if (LogsInMemory) { - Assert(LogsInMemory != DeletedLogsInMemory); - delete LogsInMemory; - } - LogsInMemory = DeletedLogsInMemory; - - DEBUG_LOG(("Debug logs started.")); - LogsBeforeSingleInstanceChecked.clear(); - return true; - } - - void multipleInstances() { - if (LogsInMemory) { - Assert(LogsInMemory != DeletedLogsInMemory); - delete LogsInMemory; - } - LogsInMemory = DeletedLogsInMemory; - - if (cDebug()) { - LOG(("WARNING: debug logs are not written in multiple instances mode!")); - } - LogsBeforeSingleInstanceChecked.clear(); - } - - void closeMain() { - LOG(("Explicitly closing main log and finishing crash handlers.")); - if (LogsData) { - LogsData->closeMain(); - } - } - - void writeMain(const QString &v) { - time_t t = time(NULL); - struct tm tm; - mylocaltime(&tm, &t); - - QString msg(QString("[%1.%2.%3 %4:%5:%6] %7\n").arg(tm.tm_year + 1900).arg(tm.tm_mon + 1, 2, 10, QChar('0')).arg(tm.tm_mday, 2, 10, QChar('0')).arg(tm.tm_hour, 2, 10, QChar('0')).arg(tm.tm_min, 2, 10, QChar('0')).arg(tm.tm_sec, 2, 10, QChar('0')).arg(v)); - _logsWrite(LogDataMain, msg); - - QString debugmsg(QString("%1 %2\n").arg(_logsEntryStart()).arg(v)); - _logsWrite(LogDataDebug, debugmsg); - } - - void writeDebug(const char *file, int32 line, const QString &v) { - const char *last = strstr(file, "/"), *found = 0; - while (last) { - found = last; - last = strstr(last + 1, "/"); - } - last = strstr(file, "\\"); - while (last) { - found = last; - last = strstr(last + 1, "\\"); - } - if (found) { - file = found + 1; - } - - QString msg(QString("%1 %2 (%3 : %4)\n").arg(_logsEntryStart()).arg(v).arg(file).arg(line)); - _logsWrite(LogDataDebug, msg); - -#ifdef Q_OS_WIN - //OutputDebugString(reinterpret_cast(msg.utf16())); -#elif defined Q_OS_MAC - //objc_outputDebugString(msg); -#elif defined Q_OS_LINUX && defined _DEBUG - //std::cout << msg.toUtf8().constData(); -#endif - } - - void writeTcp(const QString &v) { - QString msg(QString("%1 %2\n").arg(_logsEntryStart()).arg(v)); - _logsWrite(LogDataTcp, msg); - } - - void writeMtp(int32 dc, const QString &v) { - QString msg(QString("%1 (dc:%2) %3\n").arg(_logsEntryStart()).arg(dc).arg(v)); - _logsWrite(LogDataMtp, msg); - } - - QString full() { - if (LogsData) { - return LogsData->full(); - } - if (!LogsInMemory || LogsInMemory == DeletedLogsInMemory) { - return LogsBeforeSingleInstanceChecked; - } - - int32 size = LogsBeforeSingleInstanceChecked.size(); - for (LogsInMemoryList::const_iterator i = LogsInMemory->cbegin(), e = LogsInMemory->cend(); i != e; ++i) { - if (i->first == LogDataMain) { - size += i->second.size(); - } - } - QString result; - result.reserve(size); - if (!LogsBeforeSingleInstanceChecked.isEmpty()) { - result.append(LogsBeforeSingleInstanceChecked); - } - for (LogsInMemoryList::const_iterator i = LogsInMemory->cbegin(), e = LogsInMemory->cend(); i != e; ++i) { - if (i->first == LogDataMain) { - result += i->second; - } - } - return result; - } - - QString vector(const QVector &ids) { - if (!ids.size()) return "[]"; - QString idsStr = QString("[%1").arg(ids.cbegin()->v); - for (QVector::const_iterator i = ids.cbegin() + 1, e = ids.cend(); i != e; ++i) { - idsStr += QString(", %2").arg(i->v); - } - return idsStr + "]"; - } - - QString vector(const QVector &ids) { - if (!ids.size()) return "[]"; - QString idsStr = QString("[%1").arg(*ids.cbegin()); - for (QVector::const_iterator i = ids.cbegin() + 1, e = ids.cend(); i != e; ++i) { - idsStr += QString(", %2").arg(*i); - } - return idsStr + "]"; - } - -} - -void _moveOldDataFiles(const QString &wasDir) { +void MoveOldDataFiles(const QString &wasDir) { QFile data(wasDir + "data"), dataConfig(wasDir + "data_config"), tdataConfig(wasDir + "tdata/config"); if (data.exists() && dataConfig.exists() && !QFileInfo(cWorkingDir() + "data").exists() && !QFileInfo(cWorkingDir() + "data_config").exists()) { // move to home dir LOG(("Copying data to home dir '%1' from '%2'").arg(cWorkingDir()).arg(wasDir)); @@ -624,537 +314,263 @@ void _moveOldDataFiles(const QString &wasDir) { } } -#if defined Q_OS_MAC || defined Q_OS_LINUX32 || defined Q_OS_LINUX64 +} // namespace -#include -#include -#include +void start(not_null launcher) { + Assert(LogsData == 0); -#ifdef Q_OS_MAC - -#include - -#endif - -#endif - -namespace SignalHandlers { - -namespace internal { - using Annotations = std::map; - using AnnotationRefs = std::map; - - Annotations ProcessAnnotations; - AnnotationRefs ProcessAnnotationRefs; - -#ifndef TDESKTOP_DISABLE_CRASH_REPORTS - - QString ReportPath; - FILE *ReportFile = nullptr; - int ReportFileNo = 0; - char LaunchedDateTimeStr[32] = { 0 }; - char LaunchedBinaryName[256] = { 0 }; - - void writeChar(char ch) { - fwrite(&ch, 1, 1, ReportFile); + if (!Sandbox::CheckBetaVersionDir()) { + return; } - template - struct writeNumberSignAndRemoveIt { - static void call(Type &number) { - if (number < 0) { - writeChar('-'); - number = -number; - } + auto initialWorkingDir = QDir(cWorkingDir()).absolutePath() + '/'; + auto moveOldDataFrom = QString(); + auto workingDirChosen = false; + + if (cBetaVersion()) { + cSetDebug(true); + workingDirChosen = true; +#if defined Q_OS_MAC || defined Q_OS_LINUX + } else { +#ifdef _DEBUG + cForceWorkingDir(cExeDir()); +#else // _DEBUG + if (!cWorkingDir().isEmpty()) { + // This value must come only from the "-workdir" argument. + cForceWorkingDir(cWorkingDir()); + } else { + cForceWorkingDir(psAppDataPath()); } - }; - template - struct writeNumberSignAndRemoveIt { - static void call(Type &number) { - } - }; - - template - const dump &writeNumber(const dump &stream, Type number) { - if (!ReportFile) return stream; - - writeNumberSignAndRemoveIt<(Type(-1) > Type(0)), Type>::call(number); - Type upper = 1, prev = number / 10; - while (prev >= upper) { - upper *= 10; - } - while (upper > 0) { - int digit = (number / upper); - internal::writeChar('0' + digit); - number -= digit * upper; - upper /= 10; - } - return stream; - } - -} // namespace internal - - dump::~dump() { - if (internal::ReportFile) { - fflush(internal::ReportFile); - } - } - - const dump &operator<<(const dump &stream, const char *str) { - if (!internal::ReportFile) return stream; - - fwrite(str, 1, strlen(str), internal::ReportFile); - return stream; - } - - const dump &operator<<(const dump &stream, const wchar_t *str) { - if (!internal::ReportFile) return stream; - - for (int i = 0, l = wcslen(str); i < l; ++i) { - if (str[i] >= 0 && str[i] < 128) { - internal::writeChar(char(str[i])); - } else { - internal::writeChar('?'); - } - } - return stream; - } - - const dump &operator<<(const dump &stream, int num) { - return internal::writeNumber(stream, num); - } - - const dump &operator<<(const dump &stream, unsigned int num) { - return internal::writeNumber(stream, num); - } - - const dump &operator<<(const dump &stream, unsigned long num) { - return internal::writeNumber(stream, num); - } - - const dump &operator<<(const dump &stream, unsigned long long num) { - return internal::writeNumber(stream, num); - } - - const dump &operator<<(const dump &stream, double num) { - if (num < 0) { - internal::writeChar('-'); - num = -num; - } - internal::writeNumber(stream, uint64(floor(num))); - internal::writeChar('.'); - num -= floor(num); - for (int i = 0; i < 4; ++i) { - num *= 10; - int digit = int(floor(num)); - internal::writeChar('0' + digit); - num -= digit; - } - return stream; - } - -namespace internal { - - using ReservedMemoryChunk = std::array; - std::unique_ptr ReservedMemory; - - void InstallOperatorNewHandler() { - ReservedMemory = std::make_unique(); - std::set_new_handler([] { - std::set_new_handler(nullptr); - ReservedMemory.reset(); - Unexpected("Could not allocate!"); - }); - } - - Qt::HANDLE ReportingThreadId = nullptr; - bool ReportingHeaderWritten = false; - QMutex ReportingMutex; - - const char *BreakpadDumpPath = nullptr; - const wchar_t *BreakpadDumpPathW = nullptr; - -#if defined Q_OS_MAC || defined Q_OS_LINUX32 || defined Q_OS_LINUX64 - struct sigaction SIG_def[32]; - - void Handler(int signum, siginfo_t *info, void *ucontext) { - if (signum > 0) { - sigaction(signum, &SIG_def[signum], 0); - } - -#else // Q_OS_MAC || Q_OS_LINUX32 || Q_OS_LINUX64 - void Handler(int signum) { -#endif // else for Q_OS_MAC || Q_OS_LINUX || Q_OS_LINUX64 - - const char* name = 0; - switch (signum) { - case SIGABRT: name = "SIGABRT"; break; - case SIGSEGV: name = "SIGSEGV"; break; - case SIGILL: name = "SIGILL"; break; - case SIGFPE: name = "SIGFPE"; break; -#ifndef Q_OS_WIN - case SIGBUS: name = "SIGBUS"; break; - case SIGSYS: name = "SIGSYS"; break; -#endif // !Q_OS_WIN - } - - Qt::HANDLE thread = QThread::currentThreadId(); - if (thread == ReportingThreadId) return; - - QMutexLocker lock(&ReportingMutex); - ReportingThreadId = thread; - - if (!ReportingHeaderWritten) { - ReportingHeaderWritten = true; - auto dec2hex = [](int value) -> char { - if (value >= 0 && value < 10) { - return '0' + value; - } else if (value >= 10 && value < 16) { - return 'a' + (value - 10); - } - return '#'; - }; - - for (const auto &i : ProcessAnnotationRefs) { - QByteArray utf8 = i.second->toUtf8(); - std::string wrapped; - wrapped.reserve(4 * utf8.size()); - for (auto ch : utf8) { - auto uch = static_cast(ch); - wrapped.append("\\x", 2).append(1, dec2hex(uch >> 4)).append(1, dec2hex(uch & 0x0F)); - } - ProcessAnnotations[i.first] = wrapped; - } - - const Annotations c_ProcessAnnotations(ProcessAnnotations); - for (const auto &i : c_ProcessAnnotations) { - dump() << i.first.c_str() << ": " << i.second.c_str() << "\n"; - } - psWriteDump(); - dump() << "\n"; - } - if (name) { - dump() << "Caught signal " << signum << " (" << name << ") in thread " << uint64(thread) << "\n"; - } else if (signum == -1) { - dump() << "Google Breakpad caught a crash, minidump written in thread " << uint64(thread) << "\n"; - if (BreakpadDumpPath) { - dump() << "Minidump: " << BreakpadDumpPath << "\n"; - } else if (BreakpadDumpPathW) { - dump() << "Minidump: " << BreakpadDumpPathW << "\n"; - } - } else { - dump() << "Caught signal " << signum << " in thread " << uint64(thread) << "\n"; - } - - // see https://github.com/benbjohnson/bandicoot -#if defined Q_OS_MAC || defined Q_OS_LINUX32 || defined Q_OS_LINUX64 - ucontext_t *uc = (ucontext_t*)ucontext; - - void *caller = 0; - if (uc) { -#if defined(__APPLE__) && !defined(MAC_OS_X_VERSION_10_6) - /* OSX < 10.6 */ -#if defined(__x86_64__) - caller = (void*)uc->uc_mcontext->__ss.__rip; -#elif defined(__i386__) - caller = (void*)uc->uc_mcontext->__ss.__eip; -#else - caller = (void*)uc->uc_mcontext->__ss.__srr0; -#endif -#elif defined(__APPLE__) && defined(MAC_OS_X_VERSION_10_6) - /* OSX >= 10.6 */ -#if defined(_STRUCT_X86_THREAD_STATE64) && !defined(__i386__) - caller = (void*)uc->uc_mcontext->__ss.__rip; -#else - caller = (void*)uc->uc_mcontext->__ss.__eip; -#endif -#elif defined(__linux__) - /* Linux */ -#if defined(__i386__) - caller = (void*)uc->uc_mcontext.gregs[14]; /* Linux 32 */ -#elif defined(__X86_64__) || defined(__x86_64__) - caller = (void*)uc->uc_mcontext.gregs[16]; /* Linux 64 */ -#elif defined(__ia64__) /* Linux IA64 */ - caller = (void*)uc->uc_mcontext.sc_ip; -#endif - -#endif - } - - void *addresses[132] = { 0 }; - size_t size = backtrace(addresses, 128); - - /* overwrite sigaction with caller's address */ - if (caller) { - for (int i = size; i > 1; --i) { - addresses[i + 3] = addresses[i]; - } - addresses[2] = (void*)0x1; - addresses[3] = caller; - addresses[4] = (void*)0x1; - } - -#ifdef Q_OS_MAC - dump() << "\nBase image addresses:\n"; - for (size_t i = 0; i < size; ++i) { - Dl_info info; - dump() << i << " "; - if (dladdr(addresses[i], &info)) { - dump() << uint64(info.dli_fbase) << " (" << info.dli_fname << ")\n"; - } else { - dump() << "_unknown_module_\n"; - } - } -#endif // Q_OS_MAC - - dump() << "\nBacktrace:\n"; - - backtrace_symbols_fd(addresses, size, ReportFileNo); - -#else // Q_OS_MAC || Q_OS_LINUX32 || Q_OS_LINUX64 - dump() << "\nBacktrace:\n"; - - psWriteStackTrace(); -#endif // else for Q_OS_MAC || Q_OS_LINUX32 || Q_OS_LINUX64 - - dump() << "\n"; - - ReportingThreadId = nullptr; - } - - bool SetSignalHandlers = true; - bool CrashLogged = false; -#if !defined Q_OS_MAC || defined MAC_USE_BREAKPAD - google_breakpad::ExceptionHandler* BreakpadExceptionHandler = 0; - -#ifdef Q_OS_WIN - bool DumpCallback(const wchar_t* _dump_dir, const wchar_t* _minidump_id, void* context, EXCEPTION_POINTERS* exinfo, MDRawAssertionInfo* assertion, bool success) -#elif defined Q_OS_MAC // Q_OS_WIN - bool DumpCallback(const char* _dump_dir, const char* _minidump_id, void *context, bool success) -#elif defined Q_OS_LINUX64 || defined Q_OS_LINUX32 // Q_OS_MAC - bool DumpCallback(const google_breakpad::MinidumpDescriptor &md, void *context, bool success) -#endif // Q_OS_LINUX64 || Q_OS_LINUX32 - { - if (CrashLogged) return success; - CrashLogged = true; - -#ifdef Q_OS_WIN - BreakpadDumpPathW = _minidump_id; - Handler(-1); -#else // Q_OS_WIN - -#ifdef Q_OS_MAC - BreakpadDumpPath = _minidump_id; -#else // Q_OS_MAC - BreakpadDumpPath = md.path(); -#endif // else for Q_OS_MAC - Handler(-1, 0, 0); -#endif // else for Q_OS_WIN - return success; - } -#endif // !Q_OS_MAC || MAC_USE_BREAKPAD - -#endif // !TDESKTOP_DISABLE_CRASH_REPORTS - -} // namespace internal - - void StartCrashHandler() { -#ifndef TDESKTOP_DISABLE_CRASH_REPORTS - using internal::ProcessAnnotations; - - ProcessAnnotations["Binary"] = cExeName().toUtf8().constData(); - ProcessAnnotations["ApiId"] = QString::number(ApiId).toUtf8().constData(); - ProcessAnnotations["Version"] = (cBetaVersion() ? qsl("%1 beta").arg(cBetaVersion()) : (cAlphaVersion() ? qsl("%1 alpha") : qsl("%1")).arg(AppVersion)).toUtf8().constData(); - ProcessAnnotations["Launched"] = QDateTime::currentDateTime().toString("dd.MM.yyyy hh:mm:ss").toUtf8().constData(); - ProcessAnnotations["Platform"] = cPlatformString().toUtf8().constData(); - ProcessAnnotations["UserTag"] = QString::number(Sandbox::UserTag(), 16).toUtf8().constData(); - - QString dumpspath = cWorkingDir() + qsl("tdata/dumps"); - QDir().mkpath(dumpspath); - -#ifdef Q_OS_WIN - internal::BreakpadExceptionHandler = new google_breakpad::ExceptionHandler( - dumpspath.toStdWString(), - google_breakpad::ExceptionHandler::FilterCallback(nullptr), - internal::DumpCallback, - (void*)nullptr, // callback_context - google_breakpad::ExceptionHandler::HANDLER_ALL, - MINIDUMP_TYPE(MiniDumpNormal), - // MINIDUMP_TYPE(MiniDumpWithFullMemory | MiniDumpWithHandleData | MiniDumpWithThreadInfo | MiniDumpWithProcessThreadData | MiniDumpWithFullMemoryInfo | MiniDumpWithUnloadedModules | MiniDumpWithFullAuxiliaryState | MiniDumpIgnoreInaccessibleMemory | MiniDumpWithTokenInformation), - (const wchar_t*)nullptr, // pipe_name - (const google_breakpad::CustomClientInfo*)nullptr - ); -#elif defined Q_OS_MAC // Q_OS_WIN - -#ifdef MAC_USE_BREAKPAD -#ifndef _DEBUG - internal::BreakpadExceptionHandler = new google_breakpad::ExceptionHandler( - QFile::encodeName(dumpspath).toStdString(), - /*FilterCallback*/ 0, - internal::DumpCallback, - /*context*/ 0, - true, - 0 - ); #endif // !_DEBUG - internal::SetSignalHandlers = false; -#else // MAC_USE_BREAKPAD - crashpad::CrashpadClient crashpad_client; - std::string handler = (cExeDir() + cExeName() + qsl("/Contents/Helpers/crashpad_handler")).toUtf8().constData(); - std::string database = QFile::encodeName(dumpspath).constData(); - if (crashpad_client.StartHandler(base::FilePath(handler), - base::FilePath(database), - std::string(), - ProcessAnnotations, - std::vector(), - false)) { - crashpad_client.UseHandler(); + workingDirChosen = true; + +#if defined Q_OS_LINUX && !defined _DEBUG // fix first version + moveOldDataFrom = initialWorkingDir; +#endif // Q_OS_LINUX && !_DEBUG + +#elif defined Q_OS_WINRT // Q_OS_MAC || Q_OS_LINUX + } else { + cForceWorkingDir(psAppDataPath()); + workingDirChosen = true; +#elif defined OS_WIN_STORE // Q_OS_MAC || Q_OS_LINUX || Q_OS_WINRT +#ifdef _DEBUG + cForceWorkingDir(cExeDir()); +#else // _DEBUG + cForceWorkingDir(psAppDataPath()); +#endif // !_DEBUG + workingDirChosen = true; +#elif defined Q_OS_WIN + } else { + if (!cWorkingDir().isEmpty()) { + // This value must come only from the "-workdir" argument. + cForceWorkingDir(cWorkingDir()); + workingDirChosen = true; } -#endif // else for MAC_USE_BREAKPAD -#elif defined Q_OS_LINUX64 || defined Q_OS_LINUX32 - internal::BreakpadExceptionHandler = new google_breakpad::ExceptionHandler( - google_breakpad::MinidumpDescriptor(QFile::encodeName(dumpspath).toStdString()), - /*FilterCallback*/ 0, - internal::DumpCallback, - /*context*/ 0, - true, - -1 - ); -#endif // Q_OS_LINUX64 || Q_OS_LINUX32 -#endif // !TDESKTOP_DISABLE_CRASH_REPORTS +#endif // Q_OS_MAC || Q_OS_LINUX || Q_OS_WINRT || OS_WIN_STORE } - void FinishCrashHandler() { -#ifndef TDESKTOP_DISABLE_CRASH_REPORTS - -#if !defined Q_OS_MAC || defined MAC_USE_BREAKPAD - if (internal::BreakpadExceptionHandler) { - delete base::take(internal::BreakpadExceptionHandler); + LogsData = new LogsDataFields(); + if (!workingDirChosen) { + cForceWorkingDir(cExeDir()); + if (!LogsData->openMain()) { + cForceWorkingDir(psAppDataPath()); } -#endif // !Q_OS_MAC || MAC_USE_BREAKPAD - -#endif // !TDESKTOP_DISABLE_CRASH_REPORTS } - Status start() { -#ifndef TDESKTOP_DISABLE_CRASH_REPORTS - using internal::ReportPath; - ReportPath = cWorkingDir() + qsl("tdata/working"); + cForceWorkingDir(QDir(cWorkingDir()).absolutePath() + '/'); + +// WinRT build requires the working dir to stay the same for plugin loading. +#ifndef Q_OS_WINRT + QDir().setCurrent(cWorkingDir()); +#endif // !Q_OS_WINRT + + QDir().mkpath(cWorkingDir() + qstr("tdata")); + + Sandbox::WorkingDirReady(); + CrashReports::StartCatching(); + + if (!LogsData->openMain()) { + delete LogsData; + LogsData = 0; + } + + LOG(("Launched version: %1, alpha: %2, beta: %3, debug mode: %4, test dc: %5").arg(AppVersion).arg(Logs::b(cAlphaVersion())).arg(cBetaVersion()).arg(Logs::b(cDebug())).arg(Logs::b(cTestMode()))); + LOG(("Executable dir: %1, name: %2").arg(cExeDir()).arg(cExeName())); + LOG(("Initial working dir: %1").arg(initialWorkingDir)); + LOG(("Working dir: %1").arg(cWorkingDir())); + LOG(("Command line: %1").arg(launcher->argumentsString())); + + if (!LogsData) { + LOG(("FATAL: Could not open '%1' for writing log!").arg(_logsFilePath(LogDataMain, qsl("_startXX")))); + return; + } #ifdef Q_OS_WIN - FILE *f = nullptr; - if (_wfopen_s(&f, ReportPath.toStdWString().c_str(), L"rb") != 0) { - f = nullptr; - } else { -#else // !Q_OS_WIN - if (FILE *f = fopen(QFile::encodeName(ReportPath).constData(), "rb")) { -#endif // else for !Q_OS_WIN - QByteArray lastdump; - char buffer[256 * 1024] = { 0 }; - int32 read = fread(buffer, 1, 256 * 1024, f); - if (read > 0) { - lastdump.append(buffer, read); + if (cWorkingDir() == psAppDataPath()) { // fix old "Telegram Win (Unofficial)" version + moveOldDataFrom = psAppDataPathOld(); + } +#endif + if (!moveOldDataFrom.isEmpty()) { + MoveOldDataFiles(moveOldDataFrom); + } + + if (LogsInMemory) { + Assert(LogsInMemory != DeletedLogsInMemory); + LogsInMemoryList list = *LogsInMemory; + for (LogsInMemoryList::const_iterator i = list.cbegin(), e = list.cend(); i != e; ++i) { + if (i->first == LogDataMain) { + _logsWrite(i->first, i->second); } - fclose(f); - - Sandbox::SetLastCrashDump(lastdump); - - LOG(("Opened '%1' for reading, the previous Telegram Desktop launch was not finished properly :( Crash log size: %2").arg(ReportPath).arg(lastdump.size())); - - return LastCrashed; - } - -#endif // !TDESKTOP_DISABLE_CRASH_REPORTS - return restart(); - } - - Status restart() { -#ifndef TDESKTOP_DISABLE_CRASH_REPORTS - if (internal::ReportFile) { - return Started; - } - -#ifdef Q_OS_WIN - if (_wfopen_s(&internal::ReportFile, internal::ReportPath.toStdWString().c_str(), L"wb") != 0) { - internal::ReportFile = nullptr; - } -#else // Q_OS_WIN - internal::ReportFile = fopen(QFile::encodeName(internal::ReportPath).constData(), "wb"); -#endif // else for Q_OS_WIN - if (internal::ReportFile) { -#ifdef Q_OS_WIN - internal::ReportFileNo = _fileno(internal::ReportFile); -#else // Q_OS_WIN - internal::ReportFileNo = fileno(internal::ReportFile); -#endif // else for Q_OS_WIN - if (internal::SetSignalHandlers) { -#ifndef Q_OS_WIN - struct sigaction sigact; - - sigact.sa_sigaction = SignalHandlers::internal::Handler; - sigemptyset(&sigact.sa_mask); - sigact.sa_flags = SA_NODEFER | SA_RESETHAND | SA_SIGINFO; - - sigaction(SIGABRT, &sigact, &internal::SIG_def[SIGABRT]); - sigaction(SIGSEGV, &sigact, &internal::SIG_def[SIGSEGV]); - sigaction(SIGILL, &sigact, &internal::SIG_def[SIGILL]); - sigaction(SIGFPE, &sigact, &internal::SIG_def[SIGFPE]); - sigaction(SIGBUS, &sigact, &internal::SIG_def[SIGBUS]); - sigaction(SIGSYS, &sigact, &internal::SIG_def[SIGSYS]); -#else // !Q_OS_WIN - signal(SIGABRT, SignalHandlers::internal::Handler); - signal(SIGSEGV, SignalHandlers::internal::Handler); - signal(SIGILL, SignalHandlers::internal::Handler); - signal(SIGFPE, SignalHandlers::internal::Handler); -#endif // else for !Q_OS_WIN - } - - SignalHandlers::internal::InstallOperatorNewHandler(); - - return Started; - } - - LOG(("FATAL: Could not open '%1' for writing!").arg(internal::ReportPath)); - - return CantOpen; -#else // !TDESKTOP_DISABLE_CRASH_REPORTS - return Started; -#endif // else for !TDESKTOP_DISABLE_CRASH_REPORTS - } - - void finish() { -#ifndef TDESKTOP_DISABLE_CRASH_REPORTS - FinishCrashHandler(); - if (internal::ReportFile) { - fclose(internal::ReportFile); - internal::ReportFile = nullptr; - -#ifdef Q_OS_WIN - _wunlink(internal::ReportPath.toStdWString().c_str()); -#else // Q_OS_WIN - unlink(internal::ReportPath.toUtf8().constData()); -#endif // else for Q_OS_WIN - } -#endif // !TDESKTOP_DISABLE_CRASH_REPORTS - } - - void setCrashAnnotation(const std::string &key, const QString &value) { - static QMutex mutex; - QMutexLocker lock(&mutex); - - if (!value.trimmed().isEmpty()) { - internal::ProcessAnnotations[key] = value.toUtf8().constData(); - } else { - internal::ProcessAnnotations.erase(key); - } - } - - void setCrashAnnotationRef(const std::string &key, const QString *valuePtr) { - if (valuePtr) { - internal::ProcessAnnotationRefs[key] = valuePtr; - } else { - internal::ProcessAnnotationRefs.erase(key); } } + LOG(("Logs started")); } + +void finish() { + delete LogsData; + LogsData = 0; + + if (LogsInMemory && LogsInMemory != DeletedLogsInMemory) { + delete LogsInMemory; + } + LogsInMemory = DeletedLogsInMemory; + + _logsMutex(LogDataMain, true); + + CrashReports::FinishCatching(); +} + +bool started() { + return LogsData != 0; +} + +bool instanceChecked() { + if (!LogsData) return false; + + if (!LogsData->instanceChecked()) { + LogsBeforeSingleInstanceChecked = Logs::full(); + + delete LogsData; + LogsData = 0; + LOG(("FATAL: Could not move logging to '%1'!").arg(_logsFilePath(LogDataMain))); + return false; + } + + if (LogsInMemory) { + Assert(LogsInMemory != DeletedLogsInMemory); + LogsInMemoryList list = *LogsInMemory; + for (LogsInMemoryList::const_iterator i = list.cbegin(), e = list.cend(); i != e; ++i) { + if (i->first != LogDataMain) { + _logsWrite(i->first, i->second); + } + } + } + if (LogsInMemory) { + Assert(LogsInMemory != DeletedLogsInMemory); + delete LogsInMemory; + } + LogsInMemory = DeletedLogsInMemory; + + DEBUG_LOG(("Debug logs started.")); + LogsBeforeSingleInstanceChecked.clear(); + return true; +} + +void multipleInstances() { + if (LogsInMemory) { + Assert(LogsInMemory != DeletedLogsInMemory); + delete LogsInMemory; + } + LogsInMemory = DeletedLogsInMemory; + + if (cDebug()) { + LOG(("WARNING: debug logs are not written in multiple instances mode!")); + } + LogsBeforeSingleInstanceChecked.clear(); +} + +void closeMain() { + LOG(("Explicitly closing main log and finishing crash handlers.")); + if (LogsData) { + LogsData->closeMain(); + } +} + +void writeMain(const QString &v) { + time_t t = time(NULL); + struct tm tm; + mylocaltime(&tm, &t); + + QString msg(QString("[%1.%2.%3 %4:%5:%6] %7\n").arg(tm.tm_year + 1900).arg(tm.tm_mon + 1, 2, 10, QChar('0')).arg(tm.tm_mday, 2, 10, QChar('0')).arg(tm.tm_hour, 2, 10, QChar('0')).arg(tm.tm_min, 2, 10, QChar('0')).arg(tm.tm_sec, 2, 10, QChar('0')).arg(v)); + _logsWrite(LogDataMain, msg); + + QString debugmsg(QString("%1 %2\n").arg(_logsEntryStart()).arg(v)); + _logsWrite(LogDataDebug, debugmsg); +} + +void writeDebug(const char *file, int32 line, const QString &v) { + const char *last = strstr(file, "/"), *found = 0; + while (last) { + found = last; + last = strstr(last + 1, "/"); + } + last = strstr(file, "\\"); + while (last) { + found = last; + last = strstr(last + 1, "\\"); + } + if (found) { + file = found + 1; + } + + QString msg(QString("%1 %2 (%3 : %4)\n").arg(_logsEntryStart()).arg(v).arg(file).arg(line)); + _logsWrite(LogDataDebug, msg); + +#ifdef Q_OS_WIN + //OutputDebugString(reinterpret_cast(msg.utf16())); +#elif defined Q_OS_MAC + //objc_outputDebugString(msg); +#elif defined Q_OS_LINUX && defined _DEBUG + //std::cout << msg.toUtf8().constData(); +#endif +} + +void writeTcp(const QString &v) { + QString msg(QString("%1 %2\n").arg(_logsEntryStart()).arg(v)); + _logsWrite(LogDataTcp, msg); +} + +void writeMtp(int32 dc, const QString &v) { + QString msg(QString("%1 (dc:%2) %3\n").arg(_logsEntryStart()).arg(dc).arg(v)); + _logsWrite(LogDataMtp, msg); +} + +QString full() { + if (LogsData) { + return LogsData->full(); + } + if (!LogsInMemory || LogsInMemory == DeletedLogsInMemory) { + return LogsBeforeSingleInstanceChecked; + } + + int32 size = LogsBeforeSingleInstanceChecked.size(); + for (LogsInMemoryList::const_iterator i = LogsInMemory->cbegin(), e = LogsInMemory->cend(); i != e; ++i) { + if (i->first == LogDataMain) { + size += i->second.size(); + } + } + QString result; + result.reserve(size); + if (!LogsBeforeSingleInstanceChecked.isEmpty()) { + result.append(LogsBeforeSingleInstanceChecked); + } + for (LogsInMemoryList::const_iterator i = LogsInMemory->cbegin(), e = LogsInMemory->cend(); i != e; ++i) { + if (i->first == LogDataMain) { + result += i->second; + } + } + return result; +} + +} // namespace Logs diff --git a/Telegram/SourceFiles/logs.h b/Telegram/SourceFiles/logs.h index 3e70555b3..4e5dd0feb 100644 --- a/Telegram/SourceFiles/logs.h +++ b/Telegram/SourceFiles/logs.h @@ -20,60 +20,61 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once -class MTPlong; +namespace Core { +class Launcher; +} // namespace Core + namespace Logs { - void start(); - bool started(); - void finish(); +void start(not_null launcher); +bool started(); +void finish(); - bool instanceChecked(); - void multipleInstances(); +bool instanceChecked(); +void multipleInstances(); - void closeMain(); +void closeMain(); - void writeMain(const QString &v); +void writeMain(const QString &v); - void writeDebug(const char *file, int32 line, const QString &v); - void writeTcp(const QString &v); - void writeMtp(int32 dc, const QString &v); +void writeDebug(const char *file, int32 line, const QString &v); +void writeTcp(const QString &v); +void writeMtp(int32 dc, const QString &v); - QString full(); - - inline const char *b(bool v) { - return v ? "[TRUE]" : "[FALSE]"; - } - - struct MemoryBuffer { - MemoryBuffer(const void *ptr, uint32 size) : p(ptr), s(size) { - } - QString str() const { - QString result; - const uchar *buf((const uchar*)p); - const char *hex = "0123456789ABCDEF"; - result.reserve(s * 3); - for (uint32 i = 0; i < s; ++i) { - result += hex[(buf[i] >> 4)]; - result += hex[buf[i] & 0x0F]; - result += ' '; - } - result.chop(1); - return result; - } - - const void *p; - uint32 s; - }; - - inline MemoryBuffer mb(const void *ptr, uint32 size) { - return MemoryBuffer(ptr, size); - } - - QString vector(const QVector &ids); - QString vector(const QVector &ids); +QString full(); +inline const char *b(bool v) { + return v ? "[TRUE]" : "[FALSE]"; } +struct MemoryBuffer { + MemoryBuffer(const void *ptr, uint32 size) : p(ptr), s(size) { + } + QString str() const { + QString result; + const uchar *buf((const uchar*)p); + const char *hex = "0123456789ABCDEF"; + result.reserve(s * 3); + for (uint32 i = 0; i < s; ++i) { + result += hex[(buf[i] >> 4)]; + result += hex[buf[i] & 0x0F]; + result += ' '; + } + result.chop(1); + return result; + } + + const void *p; + uint32 s; + +}; + +inline MemoryBuffer mb(const void *ptr, uint32 size) { + return MemoryBuffer(ptr, size); +} + +} // namespace Logs + #define LOG(msg) (Logs::writeMain(QString msg)) //usage LOG(("log: %1 %2").arg(1).arg(2)) @@ -85,47 +86,3 @@ namespace Logs { #define MTP_LOG(dc, msg) { if (cDebug() || !Logs::started()) Logs::writeMtp(dc, QString msg); } //usage MTP_LOG(dc, ("log: %1 %2").arg(1).arg(2)) - -namespace SignalHandlers { - - struct dump { - ~dump(); - }; - const dump &operator<<(const dump &stream, const char *str); - const dump &operator<<(const dump &stream, const wchar_t *str); - const dump &operator<<(const dump &stream, int num); - const dump &operator<<(const dump &stream, unsigned int num); - const dump &operator<<(const dump &stream, unsigned long num); - const dump &operator<<(const dump &stream, unsigned long long num); - const dump &operator<<(const dump &stream, double num); - enum Status { - CantOpen, - LastCrashed, - Started - }; - Status start(); - Status restart(); // can be only CantOpen or Started - void finish(); - - void setCrashAnnotation(const std::string &key, const QString &value); - - // Remembers value pointer and tries to add the value to the crash report. - // Attention! You should call clearCrashAnnotationRef(key) before destroying value. - void setCrashAnnotationRef(const std::string &key, const QString *valuePtr); - inline void clearCrashAnnotationRef(const std::string &key) { - setCrashAnnotationRef(key, nullptr); - } - -} - -namespace base { -namespace assertion { - -inline void log(const char *message, const char *file, int line) { - auto info = QStringLiteral("%1 %2:%3").arg(message).arg(file).arg(line); - LOG(("Assertion Failed! ") + info); - SignalHandlers::setCrashAnnotation("Assertion", info); -} - -} // namespace assertion -} // namespace base diff --git a/Telegram/SourceFiles/main.cpp b/Telegram/SourceFiles/main.cpp index 6e85f27dc..3eec700af 100644 --- a/Telegram/SourceFiles/main.cpp +++ b/Telegram/SourceFiles/main.cpp @@ -18,49 +18,9 @@ to link the code of portions of this program with the OpenSSL library. Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ -#include "application.h" -#include "platform/platform_specific.h" -#include "storage/localstorage.h" +#include "core/launcher.h" int main(int argc, char *argv[]) { -#ifndef Q_OS_MAC // Retina display support is working fine, others are not. - QCoreApplication::setAttribute(Qt::AA_DisableHighDpiScaling, true); -#endif // Q_OS_MAC - QCoreApplication::setApplicationName(qsl("TelegramDesktop")); - - InitFromCommandLine(argc, argv); - if (cLaunchMode() == LaunchModeFixPrevious) { - return psFixPrevious(); - } else if (cLaunchMode() == LaunchModeCleanup) { - return psCleanup(); - } - - // both are finished in Application::closeApplication - Logs::start(); // must be started before Platform is started - Platform::start(); // must be started before QApplication is created - - int result = 0; - { - Application app(argc, argv); - result = app.exec(); - } - - DEBUG_LOG(("Telegram finished, result: %1").arg(result)); - -#ifndef TDESKTOP_DISABLE_AUTOUPDATE - if (cRestartingUpdate()) { - DEBUG_LOG(("Application Info: executing updater to install update...")); - psExecUpdater(); - } else -#endif // !TDESKTOP_DISABLE_AUTOUPDATE - if (cRestarting()) { - DEBUG_LOG(("Application Info: executing Telegram, because of restart...")); - psExecTelegram(); - } - - SignalHandlers::finish(); - Platform::finish(); - Logs::finish(); - - return result; + const auto launcher = Core::Launcher::Create(argc, argv); + return launcher ? launcher->exec() : 1; } diff --git a/Telegram/SourceFiles/mainwidget.cpp b/Telegram/SourceFiles/mainwidget.cpp index e3a0defe9..5fcd6b0b5 100644 --- a/Telegram/SourceFiles/mainwidget.cpp +++ b/Telegram/SourceFiles/mainwidget.cpp @@ -1574,7 +1574,7 @@ void MainWidget::saveRecentHashtags(const QString &text) { recent = cRecentWriteHashtags(); } found = true; - incrementRecentHashtag(recent, text.mid(i + 1, next - i - 1)); + Stickers::IncrementRecentHashtag(recent, text.mid(i + 1, next - i - 1)); } if (found) { cSetRecentWriteHashtags(recent); @@ -4389,7 +4389,7 @@ void MainWidget::incrementSticker(DocumentData *sticker) { // Remove that sticker from old recent, now it is in cloud recent stickers. bool writeOldRecent = false; - auto &recent = cGetRecentStickers(); + auto &recent = Stickers::GetRecentPack(); for (auto i = recent.begin(), e = recent.end(); i != e; ++i) { if (i->first == sticker) { writeOldRecent = true; diff --git a/Telegram/SourceFiles/mainwindow.cpp b/Telegram/SourceFiles/mainwindow.cpp index c05c17461..180e041b7 100644 --- a/Telegram/SourceFiles/mainwindow.cpp +++ b/Telegram/SourceFiles/mainwindow.cpp @@ -28,14 +28,12 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "ui/widgets/popup_menu.h" #include "ui/widgets/buttons.h" #include "ui/widgets/shadow.h" -#include "base/zlib_help.h" #include "lang/lang_cloud_manager.h" #include "lang/lang_instance.h" #include "lang/lang_keys.h" #include "shortcuts.h" #include "messenger.h" #include "application.h" -#include "platform/platform_specific.h" #include "passcodewidget.h" #include "intro/introwidget.h" #include "mainwidget.h" @@ -43,7 +41,6 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "boxes/add_contact_box.h" #include "boxes/connection_box.h" #include "observer_peer.h" -#include "autoupdater.h" #include "mediaview.h" #include "storage/localstorage.h" #include "apiwrap.h" @@ -1040,1055 +1037,3 @@ MainWindow::~MainWindow() { delete trayIcon; delete trayIconMenu; } - -PreLaunchWindow *PreLaunchWindowInstance = nullptr; - -PreLaunchWindow::PreLaunchWindow(QString title) { - Fonts::Start(); - - auto icon = Window::CreateIcon(); - setWindowIcon(icon); - setWindowFlags(Qt::Dialog | Qt::CustomizeWindowHint | Qt::WindowTitleHint | Qt::WindowCloseButtonHint); - - setWindowTitle(title.isEmpty() ? qsl("Telegram") : title); - - QPalette p(palette()); - p.setColor(QPalette::Background, QColor(255, 255, 255)); - setPalette(p); - - QLabel tmp(this); - tmp.setText(qsl("Tmp")); - _size = tmp.sizeHint().height(); - - int paddingVertical = (_size / 2); - int paddingHorizontal = _size; - int borderRadius = (_size / 5); - setStyleSheet(qsl("QPushButton { padding: %1px %2px; background-color: #ffffff; border-radius: %3px; }\nQPushButton#confirm:hover, QPushButton#cancel:hover { background-color: #e3f1fa; color: #2f9fea; }\nQPushButton#confirm { color: #2f9fea; }\nQPushButton#cancel { color: #aeaeae; }\nQLineEdit { border: 1px solid #e0e0e0; padding: 5px; }\nQLineEdit:focus { border: 2px solid #37a1de; padding: 4px; }").arg(paddingVertical).arg(paddingHorizontal).arg(borderRadius)); - if (!PreLaunchWindowInstance) { - PreLaunchWindowInstance = this; - } -} - -void PreLaunchWindow::activate() { - setWindowState(windowState() & ~Qt::WindowMinimized); - setVisible(true); - psActivateProcess(); - activateWindow(); -} - -PreLaunchWindow *PreLaunchWindow::instance() { - return PreLaunchWindowInstance; -} - -PreLaunchWindow::~PreLaunchWindow() { - if (PreLaunchWindowInstance == this) { - PreLaunchWindowInstance = nullptr; - } -} - -PreLaunchLabel::PreLaunchLabel(QWidget *parent) : QLabel(parent) { - QFont labelFont(font()); - labelFont.setFamily(Fonts::GetOverride(qsl("Open Sans Semibold"))); - labelFont.setPixelSize(static_cast(parent)->basicSize()); - setFont(labelFont); - - QPalette p(palette()); - p.setColor(QPalette::Foreground, QColor(0, 0, 0)); - setPalette(p); - show(); -}; - -void PreLaunchLabel::setText(const QString &text) { - QLabel::setText(text); - updateGeometry(); - resize(sizeHint()); -} - -PreLaunchInput::PreLaunchInput(QWidget *parent, bool password) : QLineEdit(parent) { - QFont logFont(font()); - logFont.setFamily(Fonts::GetOverride(qsl("Open Sans"))); - logFont.setPixelSize(static_cast(parent)->basicSize()); - setFont(logFont); - - QPalette p(palette()); - p.setColor(QPalette::Foreground, QColor(0, 0, 0)); - setPalette(p); - - QLineEdit::setTextMargins(0, 0, 0, 0); - setContentsMargins(0, 0, 0, 0); - if (password) { - setEchoMode(QLineEdit::Password); - } - show(); -}; - -PreLaunchLog::PreLaunchLog(QWidget *parent) : QTextEdit(parent) { - QFont logFont(font()); - logFont.setFamily(Fonts::GetOverride(qsl("Open Sans"))); - logFont.setPixelSize(static_cast(parent)->basicSize()); - setFont(logFont); - - QPalette p(palette()); - p.setColor(QPalette::Foreground, QColor(96, 96, 96)); - setPalette(p); - - setReadOnly(true); - setFrameStyle(QFrame::NoFrame | QFrame::Plain); - viewport()->setAutoFillBackground(false); - setContentsMargins(0, 0, 0, 0); - document()->setDocumentMargin(0); - show(); -}; - -PreLaunchButton::PreLaunchButton(QWidget *parent, bool confirm) : QPushButton(parent) { - setFlat(true); - - setObjectName(confirm ? "confirm" : "cancel"); - - QFont closeFont(font()); - closeFont.setFamily(Fonts::GetOverride(qsl("Open Sans Semibold"))); - closeFont.setPixelSize(static_cast(parent)->basicSize()); - setFont(closeFont); - - setCursor(Qt::PointingHandCursor); - show(); -}; - -void PreLaunchButton::setText(const QString &text) { - QPushButton::setText(text); - updateGeometry(); - resize(sizeHint()); -} - -PreLaunchCheckbox::PreLaunchCheckbox(QWidget *parent) : QCheckBox(parent) { - setTristate(false); - setCheckState(Qt::Checked); - - QFont closeFont(font()); - closeFont.setFamily(Fonts::GetOverride(qsl("Open Sans Semibold"))); - closeFont.setPixelSize(static_cast(parent)->basicSize()); - setFont(closeFont); - - setCursor(Qt::PointingHandCursor); - show(); -}; - -void PreLaunchCheckbox::setText(const QString &text) { - QCheckBox::setText(text); - updateGeometry(); - resize(sizeHint()); -} - -NotStartedWindow::NotStartedWindow() -: _label(this) -, _log(this) -, _close(this) { - _label.setText(qsl("Could not start Telegram Desktop!\nYou can see complete log below:")); - - _log.setPlainText(Logs::full()); - - connect(&_close, SIGNAL(clicked()), this, SLOT(close())); - _close.setText(qsl("CLOSE")); - - QRect scr(QApplication::primaryScreen()->availableGeometry()); - move(scr.x() + (scr.width() / 6), scr.y() + (scr.height() / 6)); - updateControls(); - show(); -} - -void NotStartedWindow::updateControls() { - _label.show(); - _log.show(); - _close.show(); - - QRect scr(QApplication::primaryScreen()->availableGeometry()); - QSize s(scr.width() / 2, scr.height() / 2); - if (s == size()) { - resizeEvent(0); - } else { - resize(s); - } -} - -void NotStartedWindow::closeEvent(QCloseEvent *e) { - deleteLater(); -} - -void NotStartedWindow::resizeEvent(QResizeEvent *e) { - int padding = _size; - _label.setGeometry(padding, padding, width() - 2 * padding, _label.sizeHint().height()); - _log.setGeometry(padding, padding * 2 + _label.sizeHint().height(), width() - 2 * padding, height() - 4 * padding - _label.height() - _close.height()); - _close.setGeometry(width() - padding - _close.width(), height() - padding - _close.height(), _close.width(), _close.height()); -} - -LastCrashedWindow::LastCrashedWindow() -: _port(80) -, _label(this) -, _pleaseSendReport(this) -, _yourReportName(this) -, _minidump(this) -, _report(this) -, _send(this) -, _sendSkip(this, false) -, _networkSettings(this) -, _continue(this) -, _showReport(this) -, _saveReport(this) -, _getApp(this) -, _includeUsername(this) -, _reportText(QString::fromUtf8(Sandbox::LastCrashDump())) -, _reportShown(false) -, _reportSaved(false) -, _sendingState(Sandbox::LastCrashDump().isEmpty() ? SendingNoReport : SendingUpdateCheck) -, _updating(this) -, _sendingProgress(0) -, _sendingTotal(0) -, _checkReply(0) -, _sendReply(0) -#ifndef TDESKTOP_DISABLE_AUTOUPDATE -, _updatingCheck(this) -, _updatingSkip(this, false) -#endif // !TDESKTOP_DISABLE_AUTOUPDATE -{ - excludeReportUsername(); - - if (!cAlphaVersion() && !cBetaVersion()) { // currently accept crash reports only from testers - _sendingState = SendingNoReport; - } - if (_sendingState != SendingNoReport) { - qint64 dumpsize = 0; - QString dumpspath = cWorkingDir() + qsl("tdata/dumps"); -#if defined Q_OS_MAC && !defined MAC_USE_BREAKPAD - dumpspath += qsl("/completed"); -#endif - QString possibleDump = getReportField(qstr("minidump"), qstr("Minidump:")); - if (!possibleDump.isEmpty()) { - if (!possibleDump.startsWith('/')) { - possibleDump = dumpspath + '/' + possibleDump; - } - if (!possibleDump.endsWith(qstr(".dmp"))) { - possibleDump += qsl(".dmp"); - } - QFileInfo possibleInfo(possibleDump); - if (possibleInfo.exists()) { - _minidumpName = possibleInfo.fileName(); - _minidumpFull = possibleInfo.absoluteFilePath(); - dumpsize = possibleInfo.size(); - } - } - if (_minidumpFull.isEmpty()) { - QString maxDump, maxDumpFull; - QDateTime maxDumpModified, workingModified = QFileInfo(cWorkingDir() + qsl("tdata/working")).lastModified(); - QFileInfoList list = QDir(dumpspath).entryInfoList(); - for (int32 i = 0, l = list.size(); i < l; ++i) { - QString name = list.at(i).fileName(); - if (name.endsWith(qstr(".dmp"))) { - QDateTime modified = list.at(i).lastModified(); - if (maxDump.isEmpty() || qAbs(workingModified.secsTo(modified)) < qAbs(workingModified.secsTo(maxDumpModified))) { - maxDump = name; - maxDumpModified = modified; - maxDumpFull = list.at(i).absoluteFilePath(); - dumpsize = list.at(i).size(); - } - } - } - if (!maxDump.isEmpty() && qAbs(workingModified.secsTo(maxDumpModified)) < 10) { - _minidumpName = maxDump; - _minidumpFull = maxDumpFull; - } - } - if (_minidumpName.isEmpty()) { // currently don't accept crash reports without dumps from google libraries - _sendingState = SendingNoReport; - } else { - _minidump.setText(qsl("+ %1 (%2 KB)").arg(_minidumpName).arg(dumpsize / 1024)); - } - } - if (_sendingState != SendingNoReport) { - QString version = getReportField(qstr("version"), qstr("Version:")); - QString current = cBetaVersion() ? qsl("-%1").arg(cBetaVersion()) : QString::number(AppVersion); - if (version != current) { // currently don't accept crash reports from not current app version - _sendingState = SendingNoReport; - } - } - - _networkSettings.setText(qsl("NETWORK SETTINGS")); - connect(&_networkSettings, SIGNAL(clicked()), this, SLOT(onNetworkSettings())); - - if (_sendingState == SendingNoReport) { - _label.setText(qsl("Last time Telegram Desktop was not closed properly.")); - } else { - _label.setText(qsl("Last time Telegram Desktop crashed :(")); - } - -#ifndef TDESKTOP_DISABLE_AUTOUPDATE - _updatingCheck.setText(qsl("TRY AGAIN")); - connect(&_updatingCheck, SIGNAL(clicked()), this, SLOT(onUpdateRetry())); - _updatingSkip.setText(qsl("SKIP")); - connect(&_updatingSkip, SIGNAL(clicked()), this, SLOT(onUpdateSkip())); - - Sandbox::connect(SIGNAL(updateChecking()), this, SLOT(onUpdateChecking())); - Sandbox::connect(SIGNAL(updateLatest()), this, SLOT(onUpdateLatest())); - Sandbox::connect(SIGNAL(updateProgress(qint64,qint64)), this, SLOT(onUpdateDownloading(qint64,qint64))); - Sandbox::connect(SIGNAL(updateFailed()), this, SLOT(onUpdateFailed())); - Sandbox::connect(SIGNAL(updateReady()), this, SLOT(onUpdateReady())); - - switch (Sandbox::updatingState()) { - case Application::UpdatingDownload: - setUpdatingState(UpdatingDownload, true); - setDownloadProgress(Sandbox::updatingReady(), Sandbox::updatingSize()); - break; - case Application::UpdatingReady: setUpdatingState(UpdatingReady, true); break; - default: setUpdatingState(UpdatingCheck, true); break; - } - - cSetLastUpdateCheck(0); - Sandbox::startUpdateCheck(); -#else // !TDESKTOP_DISABLE_AUTOUPDATE - _updating.setText(qsl("Please check if there is a new version available.")); - if (_sendingState != SendingNoReport) { - _sendingState = SendingNone; - } -#endif // else for !TDESKTOP_DISABLE_AUTOUPDATE - - _pleaseSendReport.setText(qsl("Please send us a crash report.")); - _yourReportName.setText(qsl("Your Report Tag: %1\nYour User Tag: %2").arg(QString(_minidumpName).replace(".dmp", "")).arg(Sandbox::UserTag(), 0, 16)); - _yourReportName.setCursor(style::cur_text); - _yourReportName.setTextInteractionFlags(Qt::TextSelectableByMouse); - - _includeUsername.setText(qsl("Include username @%1 as your contact info").arg(_reportUsername)); - - _report.setPlainText(_reportTextNoUsername); - - _showReport.setText(qsl("VIEW REPORT")); - connect(&_showReport, SIGNAL(clicked()), this, SLOT(onViewReport())); - _saveReport.setText(qsl("SAVE TO FILE")); - connect(&_saveReport, SIGNAL(clicked()), this, SLOT(onSaveReport())); - _getApp.setText(qsl("GET THE LATEST OFFICIAL VERSION OF TELEGRAM DESKTOP")); - connect(&_getApp, SIGNAL(clicked()), this, SLOT(onGetApp())); - - _send.setText(qsl("SEND CRASH REPORT")); - connect(&_send, SIGNAL(clicked()), this, SLOT(onSendReport())); - - _sendSkip.setText(qsl("SKIP")); - connect(&_sendSkip, SIGNAL(clicked()), this, SLOT(onContinue())); - _continue.setText(qsl("CONTINUE")); - connect(&_continue, SIGNAL(clicked()), this, SLOT(onContinue())); - - QRect scr(QApplication::primaryScreen()->availableGeometry()); - move(scr.x() + (scr.width() / 6), scr.y() + (scr.height() / 6)); - updateControls(); - show(); -} - -void LastCrashedWindow::onViewReport() { - _reportShown = !_reportShown; - updateControls(); -} - -void LastCrashedWindow::onSaveReport() { - QString to = QFileDialog::getSaveFileName(0, qsl("Telegram Crash Report"), QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation) + qsl("/report.telegramcrash"), qsl("Telegram crash report (*.telegramcrash)")); - if (!to.isEmpty()) { - QFile file(to); - if (file.open(QIODevice::WriteOnly)) { - file.write(getCrashReportRaw()); - _reportSaved = true; - updateControls(); - } - } -} - -QByteArray LastCrashedWindow::getCrashReportRaw() const { - QByteArray result(Sandbox::LastCrashDump()); - if (!_reportUsername.isEmpty() && _includeUsername.checkState() != Qt::Checked) { - result.replace((qsl("Username: ") + _reportUsername).toUtf8(), "Username: _not_included_"); - } - return result; -} - -void LastCrashedWindow::onGetApp() { - QDesktopServices::openUrl(qsl("https://desktop.telegram.org")); -} - -void LastCrashedWindow::excludeReportUsername() { - QString prefix = qstr("Username:"); - QStringList lines = _reportText.split('\n'); - for (int32 i = 0, l = lines.size(); i < l; ++i) { - if (lines.at(i).trimmed().startsWith(prefix)) { - _reportUsername = lines.at(i).trimmed().mid(prefix.size()).trimmed(); - lines.removeAt(i); - break; - } - } - _reportTextNoUsername = _reportUsername.isEmpty() ? _reportText : lines.join('\n'); -} - -QString LastCrashedWindow::getReportField(const QLatin1String &name, const QLatin1String &prefix) { - QStringList lines = _reportText.split('\n'); - for (int32 i = 0, l = lines.size(); i < l; ++i) { - if (lines.at(i).trimmed().startsWith(prefix)) { - QString data = lines.at(i).trimmed().mid(prefix.size()).trimmed(); - - if (name == qstr("version")) { - if (data.endsWith(qstr(" beta"))) { - data = QString::number(-data.replace(QRegularExpression(qsl("[^\\d]")), "").toLongLong()); - } else { - data = QString::number(data.replace(QRegularExpression(qsl("[^\\d]")), "").toLongLong()); - } - } - - return data; - } - } - return QString(); -} - -void LastCrashedWindow::addReportFieldPart(const QLatin1String &name, const QLatin1String &prefix, QHttpMultiPart *multipart) { - QString data = getReportField(name, prefix); - if (!data.isEmpty()) { - QHttpPart reportPart; - reportPart.setHeader(QNetworkRequest::ContentDispositionHeader, QVariant(qsl("form-data; name=\"%1\"").arg(name))); - reportPart.setBody(data.toUtf8()); - multipart->append(reportPart); - } -} - -void LastCrashedWindow::onSendReport() { - if (_checkReply) { - _checkReply->deleteLater(); - _checkReply = nullptr; - } - if (_sendReply) { - _sendReply->deleteLater(); - _sendReply = nullptr; - } - App::setProxySettings(_sendManager); - - QString apiid = getReportField(qstr("apiid"), qstr("ApiId:")), version = getReportField(qstr("version"), qstr("Version:")); - _checkReply = _sendManager.get(QNetworkRequest(qsl("https://tdesktop.com/crash.php?act=query_report&apiid=%1&version=%2&dmp=%3&platform=%4").arg(apiid).arg(version).arg(minidumpFileName().isEmpty() ? 0 : 1).arg(cPlatformString()))); - - connect(_checkReply, SIGNAL(error(QNetworkReply::NetworkError)), this, SLOT(onSendingError(QNetworkReply::NetworkError))); - connect(_checkReply, SIGNAL(finished()), this, SLOT(onCheckingFinished())); - - _pleaseSendReport.setText(qsl("Sending crash report...")); - _sendingState = SendingProgress; - _reportShown = false; - updateControls(); -} - -QString LastCrashedWindow::minidumpFileName() { - QFileInfo dmpFile(_minidumpFull); - if (dmpFile.exists() && dmpFile.size() > 0 && dmpFile.size() < 20 * 1024 * 1024 && - QRegularExpression(qsl("^[a-zA-Z0-9\\-]{1,64}\\.dmp$")).match(dmpFile.fileName()).hasMatch()) { - return dmpFile.fileName(); - } - return QString(); -} - -void LastCrashedWindow::onCheckingFinished() { - if (!_checkReply || _sendReply) return; - - QByteArray result = _checkReply->readAll().trimmed(); - _checkReply->deleteLater(); - _checkReply = nullptr; - - LOG(("Crash report check for sending done, result: %1").arg(QString::fromUtf8(result))); - - if (result == "Old") { - _pleaseSendReport.setText(qsl("This report is about some old version of Telegram Desktop.")); - _sendingState = SendingTooOld; - updateControls(); - return; - } else if (result == "Unofficial") { - _pleaseSendReport.setText(qsl("You use some custom version of Telegram Desktop.")); - _sendingState = SendingUnofficial; - updateControls(); - return; - } else if (result != "Report") { - _pleaseSendReport.setText(qsl("Thank you for your report!")); - _sendingState = SendingDone; - updateControls(); - - SignalHandlers::restart(); - return; - } - - auto multipart = new QHttpMultiPart(QHttpMultiPart::FormDataType); - - addReportFieldPart(qstr("platform"), qstr("Platform:"), multipart); - addReportFieldPart(qstr("version"), qstr("Version:"), multipart); - - QHttpPart reportPart; - reportPart.setHeader(QNetworkRequest::ContentTypeHeader, QVariant("application/octet-stream")); - reportPart.setHeader(QNetworkRequest::ContentDispositionHeader, QVariant("form-data; name=\"report\"; filename=\"report.telegramcrash\"")); - reportPart.setBody(getCrashReportRaw()); - multipart->append(reportPart); - - QString dmpName = minidumpFileName(); - if (!dmpName.isEmpty()) { - QFile file(_minidumpFull); - if (file.open(QIODevice::ReadOnly)) { - QByteArray minidump = file.readAll(); - file.close(); - - QString zipName = QString(dmpName).replace(qstr(".dmp"), qstr(".zip")); - - zlib::FileToWrite minidumpZip; - - zip_fileinfo zfi = { { 0, 0, 0, 0, 0, 0 }, 0, 0, 0 }; - QByteArray dmpNameUtf = dmpName.toUtf8(); - minidumpZip.openNewFile(dmpNameUtf.constData(), &zfi, nullptr, 0, nullptr, 0, nullptr, Z_DEFLATED, Z_DEFAULT_COMPRESSION); - minidumpZip.writeInFile(minidump.constData(), minidump.size()); - minidumpZip.closeFile(); - minidumpZip.close(); - - if (minidumpZip.error() == ZIP_OK) { - QHttpPart dumpPart; - dumpPart.setHeader(QNetworkRequest::ContentTypeHeader, QVariant("application/octet-stream")); - dumpPart.setHeader(QNetworkRequest::ContentDispositionHeader, QVariant(qsl("form-data; name=\"dump\"; filename=\"%1\"").arg(zipName))); - dumpPart.setBody(minidumpZip.result()); - multipart->append(dumpPart); - - _minidump.setText(qsl("+ %1 (%2 KB)").arg(zipName).arg(minidumpZip.result().size() / 1024)); - } - } - } - - _sendReply = _sendManager.post(QNetworkRequest(qsl("https://tdesktop.com/crash.php?act=report")), multipart); - multipart->setParent(_sendReply); - - connect(_sendReply, SIGNAL(error(QNetworkReply::NetworkError)), this, SLOT(onSendingError(QNetworkReply::NetworkError))); - connect(_sendReply, SIGNAL(finished()), this, SLOT(onSendingFinished())); - connect(_sendReply, SIGNAL(uploadProgress(qint64,qint64)), this, SLOT(onSendingProgress(qint64,qint64))); - - updateControls(); -} - -void LastCrashedWindow::updateControls() { - int padding = _size, h = padding + _networkSettings.height() + padding; - - _label.show(); -#ifndef TDESKTOP_DISABLE_AUTOUPDATE - h += _networkSettings.height() + padding; - if (_updatingState == UpdatingFail && (_sendingState == SendingNoReport || _sendingState == SendingUpdateCheck)) { - _networkSettings.show(); - _updatingCheck.show(); - _updatingSkip.show(); - _send.hide(); - _sendSkip.hide(); - _continue.hide(); - _pleaseSendReport.hide(); - _yourReportName.hide(); - _includeUsername.hide(); - _getApp.hide(); - _showReport.hide(); - _report.hide(); - _minidump.hide(); - _saveReport.hide(); - h += padding + _updatingCheck.height() + padding; - } else { - if (_updatingState == UpdatingCheck || _sendingState == SendingFail || _sendingState == SendingProgress) { - _networkSettings.show(); - } else { - _networkSettings.hide(); - } - if (_updatingState == UpdatingNone || _updatingState == UpdatingLatest || _updatingState == UpdatingFail) { - h += padding + _updatingCheck.height() + padding; - if (_sendingState == SendingNoReport) { - _pleaseSendReport.hide(); - _yourReportName.hide(); - _includeUsername.hide(); - _getApp.hide(); - _showReport.hide(); - _report.hide(); - _minidump.hide(); - _saveReport.hide(); - _send.hide(); - _sendSkip.hide(); - _continue.show(); - } else { - h += _showReport.height() + padding + _yourReportName.height() + padding; - _pleaseSendReport.show(); - _yourReportName.show(); - if (_reportUsername.isEmpty()) { - _includeUsername.hide(); - } else { - h += _includeUsername.height() + padding; - _includeUsername.show(); - } - if (_sendingState == SendingTooOld || _sendingState == SendingUnofficial) { - QString verStr = getReportField(qstr("version"), qstr("Version:")); - qint64 ver = verStr.isEmpty() ? 0 : verStr.toLongLong(); - if (!ver || (ver == AppVersion) || (ver < 0 && (-ver / 1000) == AppVersion)) { - h += _getApp.height() + padding; - _getApp.show(); - h -= _yourReportName.height() + padding; // hide report name - _yourReportName.hide(); - if (!_reportUsername.isEmpty()) { - h -= _includeUsername.height() + padding; - _includeUsername.hide(); - } - } else { - _getApp.hide(); - } - _showReport.hide(); - _report.hide(); - _minidump.hide(); - _saveReport.hide(); - _send.hide(); - _sendSkip.hide(); - _continue.show(); - } else { - _getApp.hide(); - if (_reportShown) { - h += (_pleaseSendReport.height() * 12.5) + padding + (_minidumpName.isEmpty() ? 0 : (_minidump.height() + padding)); - _report.show(); - if (_minidumpName.isEmpty()) { - _minidump.hide(); - } else { - _minidump.show(); - } - if (_reportSaved || _sendingState == SendingFail || _sendingState == SendingProgress || _sendingState == SendingUploading) { - _saveReport.hide(); - } else { - _saveReport.show(); - } - _showReport.hide(); - } else { - _report.hide(); - _minidump.hide(); - _saveReport.hide(); - if (_sendingState == SendingFail || _sendingState == SendingProgress || _sendingState == SendingUploading) { - _showReport.hide(); - } else { - _showReport.show(); - } - } - if (_sendingState == SendingTooMany || _sendingState == SendingDone) { - _send.hide(); - _sendSkip.hide(); - _continue.show(); - } else { - if (_sendingState == SendingProgress || _sendingState == SendingUploading) { - _send.hide(); - } else { - _send.show(); - } - _sendSkip.show(); - _continue.hide(); - } - } - } - } else { - _getApp.hide(); - _pleaseSendReport.hide(); - _yourReportName.hide(); - _includeUsername.hide(); - _showReport.hide(); - _report.hide(); - _minidump.hide(); - _saveReport.hide(); - _send.hide(); - _sendSkip.hide(); - _continue.hide(); - } - _updatingCheck.hide(); - if (_updatingState == UpdatingCheck || _updatingState == UpdatingDownload) { - h += padding + _updatingSkip.height() + padding; - _updatingSkip.show(); - } else { - _updatingSkip.hide(); - } - } -#else // !TDESKTOP_DISABLE_AUTOUPDATE - h += _networkSettings.height() + padding; - h += padding + _send.height() + padding; - if (_sendingState == SendingNoReport) { - _pleaseSendReport.hide(); - _yourReportName.hide(); - _includeUsername.hide(); - _showReport.hide(); - _report.hide(); - _minidump.hide(); - _saveReport.hide(); - _send.hide(); - _sendSkip.hide(); - _continue.show(); - _networkSettings.hide(); - } else { - h += _showReport.height() + padding + _yourReportName.height() + padding; - _pleaseSendReport.show(); - _yourReportName.show(); - if (_reportUsername.isEmpty()) { - _includeUsername.hide(); - } else { - h += _includeUsername.height() + padding; - _includeUsername.show(); - } - if (_reportShown) { - h += (_pleaseSendReport.height() * 12.5) + padding + (_minidumpName.isEmpty() ? 0 : (_minidump.height() + padding)); - _report.show(); - if (_minidumpName.isEmpty()) { - _minidump.hide(); - } else { - _minidump.show(); - } - _showReport.hide(); - if (_reportSaved || _sendingState == SendingFail || _sendingState == SendingProgress || _sendingState == SendingUploading) { - _saveReport.hide(); - } else { - _saveReport.show(); - } - } else { - _report.hide(); - _minidump.hide(); - _saveReport.hide(); - if (_sendingState == SendingFail || _sendingState == SendingProgress || _sendingState == SendingUploading) { - _showReport.hide(); - } else { - _showReport.show(); - } - } - if (_sendingState == SendingDone) { - _send.hide(); - _sendSkip.hide(); - _continue.show(); - _networkSettings.hide(); - } else { - if (_sendingState == SendingProgress || _sendingState == SendingUploading) { - _send.hide(); - } else { - _send.show(); - } - _sendSkip.show(); - if (_sendingState == SendingFail) { - _networkSettings.show(); - } else { - _networkSettings.hide(); - } - _continue.hide(); - } - } - - _getApp.show(); - h += _networkSettings.height() + padding; -#endif // else for !TDESKTOP_DISABLE_AUTOUPDATE - - QRect scr(QApplication::primaryScreen()->availableGeometry()); - QSize s(2 * padding + QFontMetrics(_label.font()).width(qsl("Last time Telegram Desktop was not closed properly.")) + padding + _networkSettings.width(), h); - if (s == size()) { - resizeEvent(0); - } else { - resize(s); - } -} - -void LastCrashedWindow::onNetworkSettings() { - auto &p = Sandbox::PreLaunchProxy(); - NetworkSettingsWindow *box = new NetworkSettingsWindow(this, p.host, p.port ? p.port : 80, p.user, p.password); - connect(box, SIGNAL(saved(QString, quint32, QString, QString)), this, SLOT(onNetworkSettingsSaved(QString, quint32, QString, QString))); - box->show(); -} - -void LastCrashedWindow::onNetworkSettingsSaved(QString host, quint32 port, QString username, QString password) { - Sandbox::RefPreLaunchProxy().host = host; - Sandbox::RefPreLaunchProxy().port = port ? port : 80; - Sandbox::RefPreLaunchProxy().user = username; - Sandbox::RefPreLaunchProxy().password = password; -#ifndef TDESKTOP_DISABLE_AUTOUPDATE - if ((_updatingState == UpdatingFail && (_sendingState == SendingNoReport || _sendingState == SendingUpdateCheck)) || (_updatingState == UpdatingCheck)) { - Sandbox::stopUpdate(); - cSetLastUpdateCheck(0); - Sandbox::startUpdateCheck(); - } else -#endif // !TDESKTOP_DISABLE_AUTOUPDATE - if (_sendingState == SendingFail || _sendingState == SendingProgress) { - onSendReport(); - } - activate(); -} - -#ifndef TDESKTOP_DISABLE_AUTOUPDATE -void LastCrashedWindow::setUpdatingState(UpdatingState state, bool force) { - if (_updatingState != state || force) { - _updatingState = state; - switch (state) { - case UpdatingLatest: - _updating.setText(qsl("Latest version is installed.")); - if (_sendingState == SendingNoReport) { - QTimer::singleShot(0, this, SLOT(onContinue())); - } else { - _sendingState = SendingNone; - } - break; - case UpdatingReady: - if (checkReadyUpdate()) { - cSetRestartingUpdate(true); - App::quit(); - return; - } else { - setUpdatingState(UpdatingFail); - return; - } - break; - case UpdatingCheck: - _updating.setText(qsl("Checking for updates...")); - break; - case UpdatingFail: - _updating.setText(qsl("Update check failed :(")); - break; - } - updateControls(); - } -} - -void LastCrashedWindow::setDownloadProgress(qint64 ready, qint64 total) { - qint64 readyTenthMb = (ready * 10 / (1024 * 1024)), totalTenthMb = (total * 10 / (1024 * 1024)); - QString readyStr = QString::number(readyTenthMb / 10) + '.' + QString::number(readyTenthMb % 10); - QString totalStr = QString::number(totalTenthMb / 10) + '.' + QString::number(totalTenthMb % 10); - QString res = qsl("Downloading update {ready} / {total} MB..").replace(qstr("{ready}"), readyStr).replace(qstr("{total}"), totalStr); - if (_newVersionDownload != res) { - _newVersionDownload = res; - _updating.setText(_newVersionDownload); - updateControls(); - } -} - -void LastCrashedWindow::onUpdateRetry() { - cSetLastUpdateCheck(0); - Sandbox::startUpdateCheck(); -} - -void LastCrashedWindow::onUpdateSkip() { - if (_sendingState == SendingNoReport) { - onContinue(); - } else { - if (_updatingState == UpdatingCheck || _updatingState == UpdatingDownload) { - Sandbox::stopUpdate(); - setUpdatingState(UpdatingFail); - } - _sendingState = SendingNone; - updateControls(); - } -} - -void LastCrashedWindow::onUpdateChecking() { - setUpdatingState(UpdatingCheck); -} - -void LastCrashedWindow::onUpdateLatest() { - setUpdatingState(UpdatingLatest); -} - -void LastCrashedWindow::onUpdateDownloading(qint64 ready, qint64 total) { - setUpdatingState(UpdatingDownload); - setDownloadProgress(ready, total); -} - -void LastCrashedWindow::onUpdateReady() { - setUpdatingState(UpdatingReady); -} - -void LastCrashedWindow::onUpdateFailed() { - setUpdatingState(UpdatingFail); -} -#endif // !TDESKTOP_DISABLE_AUTOUPDATE - -void LastCrashedWindow::onContinue() { - if (SignalHandlers::restart() == SignalHandlers::CantOpen) { - new NotStartedWindow(); - } else if (!Global::started()) { - Sandbox::launch(); - } - close(); -} - -void LastCrashedWindow::onSendingError(QNetworkReply::NetworkError e) { - LOG(("Crash report sending error: %1").arg(e)); - - _pleaseSendReport.setText(qsl("Sending crash report failed :(")); - _sendingState = SendingFail; - if (_checkReply) { - _checkReply->deleteLater(); - _checkReply = nullptr; - } - if (_sendReply) { - _sendReply->deleteLater(); - _sendReply = nullptr; - } - updateControls(); -} - -void LastCrashedWindow::onSendingFinished() { - if (_sendReply) { - QByteArray result = _sendReply->readAll(); - LOG(("Crash report sending done, result: %1").arg(QString::fromUtf8(result))); - - _sendReply->deleteLater(); - _sendReply = nullptr; - _pleaseSendReport.setText(qsl("Thank you for your report!")); - _sendingState = SendingDone; - updateControls(); - - SignalHandlers::restart(); - } -} - -void LastCrashedWindow::onSendingProgress(qint64 uploaded, qint64 total) { - if (_sendingState != SendingProgress && _sendingState != SendingUploading) return; - _sendingState = SendingUploading; - - if (total < 0) { - _pleaseSendReport.setText(qsl("Sending crash report %1 KB...").arg(uploaded / 1024)); - } else { - _pleaseSendReport.setText(qsl("Sending crash report %1 / %2 KB...").arg(uploaded / 1024).arg(total / 1024)); - } - updateControls(); -} - -void LastCrashedWindow::closeEvent(QCloseEvent *e) { - deleteLater(); -} - -void LastCrashedWindow::resizeEvent(QResizeEvent *e) { - int padding = _size; - _label.move(padding, padding + (_networkSettings.height() - _label.height()) / 2); - - _send.move(width() - padding - _send.width(), height() - padding - _send.height()); - if (_sendingState == SendingProgress || _sendingState == SendingUploading) { - _sendSkip.move(width() - padding - _sendSkip.width(), height() - padding - _sendSkip.height()); - } else { - _sendSkip.move(width() - padding - _send.width() - padding - _sendSkip.width(), height() - padding - _sendSkip.height()); - } - - _updating.move(padding, padding * 2 + _networkSettings.height() + (_networkSettings.height() - _updating.height()) / 2); - -#ifndef TDESKTOP_DISABLE_AUTOUPDATE - _pleaseSendReport.move(padding, padding * 2 + _networkSettings.height() + _networkSettings.height() + padding + (_showReport.height() - _pleaseSendReport.height()) / 2); - _showReport.move(padding * 2 + _pleaseSendReport.width(), padding * 2 + _networkSettings.height() + _networkSettings.height() + padding); - _yourReportName.move(padding, _showReport.y() + _showReport.height() + padding); - _includeUsername.move(padding, _yourReportName.y() + _yourReportName.height() + padding); - _getApp.move((width() - _getApp.width()) / 2, _showReport.y() + _showReport.height() + padding); - - if (_sendingState == SendingFail || _sendingState == SendingProgress) { - _networkSettings.move(padding * 2 + _pleaseSendReport.width(), padding * 2 + _networkSettings.height() + _networkSettings.height() + padding); - } else { - _networkSettings.move(padding * 2 + _updating.width(), padding * 2 + _networkSettings.height()); - } - - if (_updatingState == UpdatingCheck || _updatingState == UpdatingDownload) { - _updatingCheck.move(width() - padding - _updatingCheck.width(), height() - padding - _updatingCheck.height()); - _updatingSkip.move(width() - padding - _updatingSkip.width(), height() - padding - _updatingSkip.height()); - } else { - _updatingCheck.move(width() - padding - _updatingCheck.width(), height() - padding - _updatingCheck.height()); - _updatingSkip.move(width() - padding - _updatingCheck.width() - padding - _updatingSkip.width(), height() - padding - _updatingSkip.height()); - } -#else // !TDESKTOP_DISABLE_AUTOUPDATE - _getApp.move((width() - _getApp.width()) / 2, _updating.y() + _updating.height() + padding); - - _pleaseSendReport.move(padding, padding * 2 + _networkSettings.height() + _networkSettings.height() + padding + _getApp.height() + padding + (_showReport.height() - _pleaseSendReport.height()) / 2); - _showReport.move(padding * 2 + _pleaseSendReport.width(), padding * 2 + _networkSettings.height() + _networkSettings.height() + padding + _getApp.height() + padding); - _yourReportName.move(padding, _showReport.y() + _showReport.height() + padding); - _includeUsername.move(padding, _yourReportName.y() + _yourReportName.height() + padding); - - _networkSettings.move(padding * 2 + _pleaseSendReport.width(), padding * 2 + _networkSettings.height() + _networkSettings.height() + padding + _getApp.height() + padding); -#endif // else for !TDESKTOP_DISABLE_AUTOUPDATE - if (_reportUsername.isEmpty()) { - _report.setGeometry(padding, _yourReportName.y() + _yourReportName.height() + padding, width() - 2 * padding, _pleaseSendReport.height() * 12.5); - } else { - _report.setGeometry(padding, _includeUsername.y() + _includeUsername.height() + padding, width() - 2 * padding, _pleaseSendReport.height() * 12.5); - } - _minidump.move(padding, _report.y() + _report.height() + padding); - _saveReport.move(_showReport.x(), _showReport.y()); - - _continue.move(width() - padding - _continue.width(), height() - padding - _continue.height()); -} - -NetworkSettingsWindow::NetworkSettingsWindow(QWidget *parent, QString host, quint32 port, QString username, QString password) -: PreLaunchWindow(qsl("HTTP Proxy Settings")) -, _hostLabel(this) -, _portLabel(this) -, _usernameLabel(this) -, _passwordLabel(this) -, _hostInput(this) -, _portInput(this) -, _usernameInput(this) -, _passwordInput(this, true) -, _save(this) -, _cancel(this, false) -, _parent(parent) { - setWindowModality(Qt::ApplicationModal); - - _hostLabel.setText(qsl("Hostname")); - _portLabel.setText(qsl("Port")); - _usernameLabel.setText(qsl("Username")); - _passwordLabel.setText(qsl("Password")); - - _save.setText(qsl("SAVE")); - connect(&_save, SIGNAL(clicked()), this, SLOT(onSave())); - _cancel.setText(qsl("CANCEL")); - connect(&_cancel, SIGNAL(clicked()), this, SLOT(close())); - - _hostInput.setText(host); - _portInput.setText(QString::number(port)); - _usernameInput.setText(username); - _passwordInput.setText(password); - - QRect scr(QApplication::primaryScreen()->availableGeometry()); - move(scr.x() + (scr.width() / 6), scr.y() + (scr.height() / 6)); - updateControls(); - show(); - - _hostInput.setFocus(); - _hostInput.setCursorPosition(_hostInput.text().size()); -} - -void NetworkSettingsWindow::resizeEvent(QResizeEvent *e) { - int padding = _size; - _hostLabel.move(padding, padding); - _hostInput.setGeometry(_hostLabel.x(), _hostLabel.y() + _hostLabel.height(), 2 * _hostLabel.width(), _hostInput.height()); - _portLabel.move(padding + _hostInput.width() + padding, padding); - _portInput.setGeometry(_portLabel.x(), _portLabel.y() + _portLabel.height(), width() - padding - _portLabel.x(), _portInput.height()); - _usernameLabel.move(padding, _hostInput.y() + _hostInput.height() + padding); - _usernameInput.setGeometry(_usernameLabel.x(), _usernameLabel.y() + _usernameLabel.height(), (width() - 3 * padding) / 2, _usernameInput.height()); - _passwordLabel.move(padding + _usernameInput.width() + padding, _usernameLabel.y()); - _passwordInput.setGeometry(_passwordLabel.x(), _passwordLabel.y() + _passwordLabel.height(), width() - padding - _passwordLabel.x(), _passwordInput.height()); - - _save.move(width() - padding - _save.width(), height() - padding - _save.height()); - _cancel.move(_save.x() - padding - _cancel.width(), _save.y()); -} - -void NetworkSettingsWindow::onSave() { - QString host = _hostInput.text().trimmed(), port = _portInput.text().trimmed(), username = _usernameInput.text().trimmed(), password = _passwordInput.text().trimmed(); - if (!port.isEmpty() && !port.toUInt()) { - _portInput.setFocus(); - return; - } else if (!host.isEmpty() && port.isEmpty()) { - _portInput.setFocus(); - return; - } - emit saved(host, port.toUInt(), username, password); - close(); -} - -void NetworkSettingsWindow::closeEvent(QCloseEvent *e) { -} - -void NetworkSettingsWindow::updateControls() { - _hostInput.updateGeometry(); - _hostInput.resize(_hostInput.sizeHint()); - _portInput.updateGeometry(); - _portInput.resize(_portInput.sizeHint()); - _usernameInput.updateGeometry(); - _usernameInput.resize(_usernameInput.sizeHint()); - _passwordInput.updateGeometry(); - _passwordInput.resize(_passwordInput.sizeHint()); - - int padding = _size; - int w = 2 * padding + _hostLabel.width() * 2 + padding + _portLabel.width() * 2 + padding; - int h = padding + _hostLabel.height() + _hostInput.height() + padding + _usernameLabel.height() + _usernameInput.height() + padding + _save.height() + padding; - if (w == width() && h == height()) { - resizeEvent(0); - } else { - setGeometry(_parent->x() + (_parent->width() - w) / 2, _parent->y() + (_parent->height() - h) / 2, w, h); - } -} diff --git a/Telegram/SourceFiles/mainwindow.h b/Telegram/SourceFiles/mainwindow.h index f8be53177..4eab6dedf 100644 --- a/Telegram/SourceFiles/mainwindow.h +++ b/Telegram/SourceFiles/mainwindow.h @@ -224,219 +224,3 @@ private: Local::ClearManager *_clearManager = nullptr; }; - -class PreLaunchWindow : public TWidget { -public: - - PreLaunchWindow(QString title = QString()); - void activate(); - int basicSize() const { - return _size; - } - ~PreLaunchWindow(); - - static PreLaunchWindow *instance(); - -protected: - - int _size; - -}; - -class PreLaunchLabel : public QLabel { -public: - PreLaunchLabel(QWidget *parent); - void setText(const QString &text); -}; - -class PreLaunchInput : public QLineEdit { -public: - PreLaunchInput(QWidget *parent, bool password = false); -}; - -class PreLaunchLog : public QTextEdit { -public: - PreLaunchLog(QWidget *parent); -}; - -class PreLaunchButton : public QPushButton { -public: - PreLaunchButton(QWidget *parent, bool confirm = true); - void setText(const QString &text); -}; - -class PreLaunchCheckbox : public QCheckBox { -public: - PreLaunchCheckbox(QWidget *parent); - void setText(const QString &text); -}; - -class NotStartedWindow : public PreLaunchWindow { -public: - - NotStartedWindow(); - -protected: - - void closeEvent(QCloseEvent *e); - void resizeEvent(QResizeEvent *e); - -private: - - void updateControls(); - - PreLaunchLabel _label; - PreLaunchLog _log; - PreLaunchButton _close; - -}; - -class LastCrashedWindow : public PreLaunchWindow { - Q_OBJECT - -public: - - LastCrashedWindow(); - -public slots: - - void onViewReport(); - void onSaveReport(); - void onSendReport(); - void onGetApp(); - - void onNetworkSettings(); - void onNetworkSettingsSaved(QString host, quint32 port, QString username, QString password); - void onContinue(); - - void onCheckingFinished(); - void onSendingError(QNetworkReply::NetworkError e); - void onSendingFinished(); - void onSendingProgress(qint64 uploaded, qint64 total); - -#ifndef TDESKTOP_DISABLE_AUTOUPDATE - void onUpdateRetry(); - void onUpdateSkip(); - - void onUpdateChecking(); - void onUpdateLatest(); - void onUpdateDownloading(qint64 ready, qint64 total); - void onUpdateReady(); - void onUpdateFailed(); -#endif // !TDESKTOP_DISABLE_AUTOUPDATE - -protected: - - void closeEvent(QCloseEvent *e); - void resizeEvent(QResizeEvent *e); - -private: - - QString minidumpFileName(); - void updateControls(); - - QString _host, _username, _password; - quint32 _port; - - PreLaunchLabel _label, _pleaseSendReport, _yourReportName, _minidump; - PreLaunchLog _report; - PreLaunchButton _send, _sendSkip, _networkSettings, _continue, _showReport, _saveReport, _getApp; - PreLaunchCheckbox _includeUsername; - - QString _minidumpName, _minidumpFull, _reportText; - QString _reportUsername, _reportTextNoUsername; - QByteArray getCrashReportRaw() const; - - bool _reportShown, _reportSaved; - - void excludeReportUsername(); - - enum SendingState { - SendingNoReport, - SendingUpdateCheck, - SendingNone, - SendingTooOld, - SendingTooMany, - SendingUnofficial, - SendingProgress, - SendingUploading, - SendingFail, - SendingDone, - }; - SendingState _sendingState; - - PreLaunchLabel _updating; - qint64 _sendingProgress, _sendingTotal; - - QNetworkAccessManager _sendManager; - QNetworkReply *_checkReply, *_sendReply; - -#ifndef TDESKTOP_DISABLE_AUTOUPDATE - PreLaunchButton _updatingCheck, _updatingSkip; - enum UpdatingState { - UpdatingNone, - UpdatingCheck, - UpdatingLatest, - UpdatingDownload, - UpdatingFail, - UpdatingReady - }; - UpdatingState _updatingState; - QString _newVersionDownload; - - void setUpdatingState(UpdatingState state, bool force = false); - void setDownloadProgress(qint64 ready, qint64 total); -#endif // !TDESKTOP_DISABLE_AUTOUPDATE - - QString getReportField(const QLatin1String &name, const QLatin1String &prefix); - void addReportFieldPart(const QLatin1String &name, const QLatin1String &prefix, QHttpMultiPart *multipart); - -}; - -class NetworkSettingsWindow : public PreLaunchWindow { - Q_OBJECT - -public: - - NetworkSettingsWindow(QWidget *parent, QString host, quint32 port, QString username, QString password); - -signals: - - void saved(QString host, quint32 port, QString username, QString password); - -public slots: - - void onSave(); - -protected: - - void closeEvent(QCloseEvent *e); - void resizeEvent(QResizeEvent *e); - -private: - - void updateControls(); - - PreLaunchLabel _hostLabel, _portLabel, _usernameLabel, _passwordLabel; - PreLaunchInput _hostInput, _portInput, _usernameInput, _passwordInput; - PreLaunchButton _save, _cancel; - - QWidget *_parent; - -}; - -class ShowCrashReportWindow : public PreLaunchWindow { -public: - - ShowCrashReportWindow(const QString &text); - -protected: - - void resizeEvent(QResizeEvent *e); - void closeEvent(QCloseEvent *e); - -private: - - PreLaunchLog _log; - -}; diff --git a/Telegram/SourceFiles/media/media_audio_ffmpeg_loader.cpp b/Telegram/SourceFiles/media/media_audio_ffmpeg_loader.cpp index d76fbd968..50f08ec20 100644 --- a/Telegram/SourceFiles/media/media_audio_ffmpeg_loader.cpp +++ b/Telegram/SourceFiles/media/media_audio_ffmpeg_loader.cpp @@ -20,6 +20,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #include "media/media_audio_ffmpeg_loader.h" +#include "core/crash_reports.h" + namespace { constexpr AVSampleFormat AudioToFormat = AV_SAMPLE_FMT_S16; @@ -423,7 +425,7 @@ AudioPlayerLoader::ReadResult FFMpegLoader::readFromReadyFrame(QByteArray &resul ).arg(ptrdiff_t(frame->extended_data[0]) ).arg(ptrdiff_t(frame->data[1]) ); - SignalHandlers::setCrashAnnotation(key, value); + CrashReports::SetAnnotation(key, value); } } @@ -435,7 +437,7 @@ AudioPlayerLoader::ReadResult FFMpegLoader::readFromReadyFrame(QByteArray &resul if (frame->extended_data[1] == nullptr) { const auto key = "ffmpeg_" + std::to_string(ptrdiff_t(this)); - SignalHandlers::setCrashAnnotation(key, QString()); + CrashReports::ClearAnnotation(key); } int32 resultLen = av_samples_get_buffer_size(0, AudioToChannels, res, AudioToFormat, 1); diff --git a/Telegram/SourceFiles/messenger.cpp b/Telegram/SourceFiles/messenger.cpp index b11453f25..a4d4facd8 100644 --- a/Telegram/SourceFiles/messenger.cpp +++ b/Telegram/SourceFiles/messenger.cpp @@ -75,7 +75,9 @@ struct Messenger::Private { base::Timer quitTimer; }; -Messenger::Messenger() : QObject() +Messenger::Messenger(not_null launcher) +: QObject() +, _launcher(launcher) , _private(std::make_unique()) , _langpack(std::make_unique()) , _audio(std::make_unique()) diff --git a/Telegram/SourceFiles/messenger.h b/Telegram/SourceFiles/messenger.h index 459fbdec5..97da6bc83 100644 --- a/Telegram/SourceFiles/messenger.h +++ b/Telegram/SourceFiles/messenger.h @@ -24,6 +24,17 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "mtproto/auth_key.h" #include "base/timer.h" +class AuthSession; +class AuthSessionData; +class MainWidget; +class FileUploader; +class Translator; +class MediaView; + +namespace Core { +class Launcher; +} // namespace Core + namespace App { void quit(); } // namespace App @@ -36,13 +47,6 @@ using AuthKeyPtr = std::shared_ptr; using AuthKeysList = std::vector; } // namespace MTP -class AuthSession; -class AuthSessionData; -class MainWidget; -class FileUploader; -class Translator; -class MediaView; - namespace Media { namespace Audio { class Instance; @@ -59,13 +63,17 @@ class Messenger final : public QObject, public RPCSender, private base::Subscrib Q_OBJECT public: - Messenger(); + Messenger(not_null launcher); Messenger(const Messenger &other) = delete; Messenger &operator=(const Messenger &other) = delete; ~Messenger(); + not_null launcher() const { + return _launcher; + } + // Windows interface. MainWindow *getActiveWindow() const; bool closeActiveWindow(); @@ -220,6 +228,8 @@ private: void loggedOut(); + not_null _launcher; + QMap photoUpdates; QMap killDownloadSessionTimes; diff --git a/Telegram/SourceFiles/mtproto/connection.cpp b/Telegram/SourceFiles/mtproto/connection.cpp index bb21f7e98..cbeb73845 100644 --- a/Telegram/SourceFiles/mtproto/connection.cpp +++ b/Telegram/SourceFiles/mtproto/connection.cpp @@ -45,6 +45,15 @@ constexpr auto kMaxModExpSize = 256; // Don't try to handle messages larger than this size. constexpr auto kMaxMessageLength = 16 * 1024 * 1024; +QString LogIdsVector(const QVector &ids) { + if (!ids.size()) return "[]"; + auto idsStr = QString("[%1").arg(ids.cbegin()->v); + for (const auto &id : ids) { + idsStr += QString(", %2").arg(id.v); + } + return idsStr + "]"; +} + bool IsGoodModExpFirst(const openssl::BigNum &modexp, const openssl::BigNum &prime) { auto diff = prime - modexp; if (modexp.failed() || prime.failed() || diff.failed()) { @@ -1432,7 +1441,7 @@ void ConnectionPrivate::handleReceived() { // send acks uint32 toAckSize = ackRequestData.size(); if (toAckSize) { - DEBUG_LOG(("MTP Info: will send %1 acks, ids: %2").arg(toAckSize).arg(Logs::vector(ackRequestData))); + DEBUG_LOG(("MTP Info: will send %1 acks, ids: %2").arg(toAckSize).arg(LogIdsVector(ackRequestData))); emit sendAnythingAsync(MTPAckSendWaiting); } @@ -1546,7 +1555,7 @@ ConnectionPrivate::HandleResult ConnectionPrivate::handleOneReceived(const mtpPr auto &ids = msg.c_msgs_ack().vmsg_ids.v; uint32 idsCount = ids.size(); - DEBUG_LOG(("Message Info: acks received, ids: %1").arg(Logs::vector(ids))); + DEBUG_LOG(("Message Info: acks received, ids: %1").arg(LogIdsVector(ids))); if (!idsCount) return (badTime ? HandleResult::Ignored : HandleResult::Success); if (badTime) { @@ -1676,7 +1685,7 @@ ConnectionPrivate::HandleResult ConnectionPrivate::handleOneReceived(const mtpPr msg.read(from, end); auto &ids = msg.c_msgs_state_req().vmsg_ids.v; auto idsCount = ids.size(); - DEBUG_LOG(("Message Info: msgs_state_req received, ids: %1").arg(Logs::vector(ids))); + DEBUG_LOG(("Message Info: msgs_state_req received, ids: %1").arg(LogIdsVector(ids))); if (!idsCount) return HandleResult::Success; QByteArray info(idsCount, Qt::Uninitialized); @@ -1787,7 +1796,7 @@ ConnectionPrivate::HandleResult ConnectionPrivate::handleOneReceived(const mtpPr QVector toAck; - DEBUG_LOG(("Message Info: msgs all info received, msgId %1, reqMsgIds: %2, states %3").arg(msgId).arg(Logs::vector(ids)).arg(Logs::mb(states.data(), states.length()).str())); + DEBUG_LOG(("Message Info: msgs all info received, msgId %1, reqMsgIds: %2, states %3").arg(msgId).arg(LogIdsVector(ids)).arg(Logs::mb(states.data(), states.length()).str())); handleMsgsStates(ids, states, toAck); requestsAcked(toAck); @@ -1856,7 +1865,7 @@ ConnectionPrivate::HandleResult ConnectionPrivate::handleOneReceived(const mtpPr auto &ids = msg.c_msg_resend_req().vmsg_ids.v; auto idsCount = ids.size(); - DEBUG_LOG(("Message Info: resend of msgs requested, ids: %1").arg(Logs::vector(ids))); + DEBUG_LOG(("Message Info: resend of msgs requested, ids: %1").arg(LogIdsVector(ids))); if (!idsCount) return (badTime ? HandleResult::Ignored : HandleResult::Success); QVector toResend(ids.size()); @@ -2087,7 +2096,7 @@ bool ConnectionPrivate::requestsFixTimeSalt(const QVector &ids, int32 s void ConnectionPrivate::requestsAcked(const QVector &ids, bool byResponse) { uint32 idsCount = ids.size(); - DEBUG_LOG(("Message Info: requests acked, ids %1").arg(Logs::vector(ids))); + DEBUG_LOG(("Message Info: requests acked, ids %1").arg(LogIdsVector(ids))); RPCCallbackClears clearedAcked; QVector toAckMore; diff --git a/Telegram/SourceFiles/mtproto/facade.h b/Telegram/SourceFiles/mtproto/facade.h index 85bfdb4af..113d94bde 100644 --- a/Telegram/SourceFiles/mtproto/facade.h +++ b/Telegram/SourceFiles/mtproto/facade.h @@ -246,7 +246,7 @@ mtpRequestId Session::send(const TRequest &request, RPCResponseHandler callbacks sendPrepared(reqSerialized, msCanWait); } catch (Exception &e) { requestId = 0; - rpcErrorOccured(requestId, callbacks.onFail, rpcClientError("NO_REQUEST_ID", QString("send() failed to queue request, exception: %1").arg(e.what()))); + requestPrepareFailed(callbacks.onFail, e); } if (requestId) registerRequest(requestId, toMainDC ? -getDcWithShift() : getDcWithShift()); return requestId; diff --git a/Telegram/SourceFiles/mtproto/session.cpp b/Telegram/SourceFiles/mtproto/session.cpp index cfe111134..c5e0366a1 100644 --- a/Telegram/SourceFiles/mtproto/session.cpp +++ b/Telegram/SourceFiles/mtproto/session.cpp @@ -23,9 +23,22 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "mtproto/connection.h" #include "mtproto/dcenter.h" #include "mtproto/auth_key.h" +#include "core/crash_reports.h" namespace MTP { namespace internal { +namespace { + +QString LogIds(const QVector &ids) { + if (!ids.size()) return "[]"; + auto idsStr = QString("[%1").arg(*ids.cbegin()); + for (const auto id : ids) { + idsStr += QString(", %2").arg(id); + } + return idsStr + "]"; +} + +} // namespace void SessionData::setKey(const AuthKeyPtr &key) { if (_authKey != key) { @@ -140,6 +153,23 @@ bool Session::rpcErrorOccured(mtpRequestId requestId, const RPCFailHandlerPtr &o return _instance->rpcErrorOccured(requestId, onFail, err); } +void Session::requestPrepareFailed( + const RPCFailHandlerPtr &onFail, + Exception &e) { + CrashReports::SetAnnotation("RequestException", QString::fromLatin1(e.what())); + Unexpected("Exception in Session::send()"); + + const auto requestId = 0; + const auto error = rpcClientError( + "NO_REQUEST_ID", + QString( + "send() failed to queue request, exception: %1" + ).arg( + e.what() + )); + rpcErrorOccured(requestId, onFail, error); +} + void Session::restart() { if (_killed) { DEBUG_LOG(("Session Error: can't restart a killed session")); @@ -271,7 +301,7 @@ void Session::checkRequestsByTimer() { } if (stateRequestIds.size()) { - DEBUG_LOG(("MTP Info: requesting state of msgs: %1").arg(Logs::vector(stateRequestIds))); + DEBUG_LOG(("MTP Info: requesting state of msgs: %1").arg(LogIds(stateRequestIds))); { QWriteLocker locker(data.stateRequestMutex()); for (uint32 i = 0, l = stateRequestIds.size(); i < l; ++i) { diff --git a/Telegram/SourceFiles/mtproto/session.h b/Telegram/SourceFiles/mtproto/session.h index 54559d0e5..182ff77f4 100644 --- a/Telegram/SourceFiles/mtproto/session.h +++ b/Telegram/SourceFiles/mtproto/session.h @@ -356,6 +356,7 @@ private: mtpRequestId storeRequest(mtpRequest &request, const RPCResponseHandler &parser); mtpRequest getRequest(mtpRequestId requestId); bool rpcErrorOccured(mtpRequestId requestId, const RPCFailHandlerPtr &onFail, const RPCError &err); + void requestPrepareFailed(const RPCFailHandlerPtr &onFail, Exception &e); not_null _instance; std::unique_ptr _connection; diff --git a/Telegram/SourceFiles/platform/linux/launcher_linux.cpp b/Telegram/SourceFiles/platform/linux/launcher_linux.cpp new file mode 100644 index 000000000..3701c90c5 --- /dev/null +++ b/Telegram/SourceFiles/platform/linux/launcher_linux.cpp @@ -0,0 +1,28 @@ +/* +This file is part of Telegram Desktop, +the official desktop version of Telegram messaging app, see https://telegram.org + +Telegram Desktop is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +It is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +In addition, as a special exception, the copyright holders give permission +to link the code of portions of this program with the OpenSSL library. + +Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE +Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org +*/ +#include "platform/linux/launcher_linux.h" + +namespace Platform { + +void Launcher::initHook() { +} + +} // namespace diff --git a/Telegram/SourceFiles/platform/linux/launcher_linux.h b/Telegram/SourceFiles/platform/linux/launcher_linux.h new file mode 100644 index 000000000..9ff229828 --- /dev/null +++ b/Telegram/SourceFiles/platform/linux/launcher_linux.h @@ -0,0 +1,36 @@ +/* +This file is part of Telegram Desktop, +the official desktop version of Telegram messaging app, see https://telegram.org + +Telegram Desktop is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +It is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +In addition, as a special exception, the copyright holders give permission +to link the code of portions of this program with the OpenSSL library. + +Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE +Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org +*/ +#pragma once + +#include "core/launcher.h" + +namespace Platform { + +class Launcher : public Core::Launcher { +public: + using Core::Launcher::Launcher; + +private: + void initHook() override; + +}; + +} // namespace Platform diff --git a/Telegram/SourceFiles/platform/linux/specific_linux.cpp b/Telegram/SourceFiles/platform/linux/specific_linux.cpp index fd478d86e..c7b24fe7d 100644 --- a/Telegram/SourceFiles/platform/linux/specific_linux.cpp +++ b/Telegram/SourceFiles/platform/linux/specific_linux.cpp @@ -25,6 +25,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "platform/linux/file_utilities_linux.h" #include "platform/platform_notifications_manager.h" #include "storage/localstorage.h" +#include "core/crash_reports.h" #include #include @@ -598,7 +599,7 @@ bool _execUpdater(bool update = true, const QString &crashreport = QString()) { } Logs::closeMain(); - SignalHandlers::finish(); + CrashReports::Finish(); pid_t pid = fork(); switch (pid) { case -1: return false; diff --git a/Telegram/SourceFiles/platform/mac/launcher_mac.h b/Telegram/SourceFiles/platform/mac/launcher_mac.h new file mode 100644 index 000000000..9ff229828 --- /dev/null +++ b/Telegram/SourceFiles/platform/mac/launcher_mac.h @@ -0,0 +1,36 @@ +/* +This file is part of Telegram Desktop, +the official desktop version of Telegram messaging app, see https://telegram.org + +Telegram Desktop is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +It is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +In addition, as a special exception, the copyright holders give permission +to link the code of portions of this program with the OpenSSL library. + +Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE +Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org +*/ +#pragma once + +#include "core/launcher.h" + +namespace Platform { + +class Launcher : public Core::Launcher { +public: + using Core::Launcher::Launcher; + +private: + void initHook() override; + +}; + +} // namespace Platform diff --git a/Telegram/SourceFiles/platform/mac/launcher_mac.mm b/Telegram/SourceFiles/platform/mac/launcher_mac.mm new file mode 100644 index 000000000..419e272e0 --- /dev/null +++ b/Telegram/SourceFiles/platform/mac/launcher_mac.mm @@ -0,0 +1,32 @@ +/* +This file is part of Telegram Desktop, +the official desktop version of Telegram messaging app, see https://telegram.org + +Telegram Desktop is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +It is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +In addition, as a special exception, the copyright holders give permission +to link the code of portions of this program with the OpenSSL library. + +Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE +Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org +*/ +#include "platform/mac/launcher_mac.h" + +namespace Platform { + +void Launcher::initHook() { +#ifndef OS_MAC_OLD + // macOS Retina display support is working fine, others are not. + QCoreApplication::setAttribute(Qt::AA_DisableHighDpiScaling, false); +#endif // OS_MAC_OLD +} + +} // namespace Platform diff --git a/Telegram/SourceFiles/platform/mac/specific_mac.mm b/Telegram/SourceFiles/platform/mac/specific_mac.mm index dd2622ba1..32b805ade 100644 --- a/Telegram/SourceFiles/platform/mac/specific_mac.mm +++ b/Telegram/SourceFiles/platform/mac/specific_mac.mm @@ -17,19 +17,18 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #include "platform/mac/specific_mac.h" -#include - #include "lang/lang_keys.h" #include "application.h" #include "mainwidget.h" #include "history/history_widget.h" - +#include "core/crash_reports.h" #include "storage/localstorage.h" #include "passcodewidget.h" #include "mainwindow.h" #include "history/history_location_manager.h" #include "platform/mac/mac_utilities.h" +#include #include #include @@ -92,7 +91,7 @@ QAbstractNativeEventFilter *psNativeEventFilter() { void psWriteDump() { double v = objc_appkitVersion(); - SignalHandlers::dump() << "OS-Version: " << v; + CrashReports::dump() << "OS-Version: " << v; } QString demanglestr(const QString &mangled) { diff --git a/Telegram/SourceFiles/platform/mac/specific_mac_p.mm b/Telegram/SourceFiles/platform/mac/specific_mac_p.mm index 422add55f..dd52b88a2 100644 --- a/Telegram/SourceFiles/platform/mac/specific_mac_p.mm +++ b/Telegram/SourceFiles/platform/mac/specific_mac_p.mm @@ -27,6 +27,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "styles/style_window.h" #include "lang/lang_keys.h" #include "base/timer.h" +#include "core/crash_reports.h" #include #include @@ -441,7 +442,7 @@ BOOL _execUpdater(BOOL update = YES, const QString &crashreport = QString()) { DEBUG_LOG(("Application Info: executing %1 %2").arg(NS2QString(path)).arg(NS2QString([args componentsJoinedByString:@" "]))); Logs::closeMain(); - SignalHandlers::finish(); + CrashReports::Finish(); if (![NSTask launchedTaskWithLaunchPath:path arguments:args]) { DEBUG_LOG(("Task not launched while executing %1 %2").arg(NS2QString(path)).arg(NS2QString([args componentsJoinedByString:@" "]))); return NO; diff --git a/Telegram/SourceFiles/platform/platform_launcher.h b/Telegram/SourceFiles/platform/platform_launcher.h new file mode 100644 index 000000000..cdc05f810 --- /dev/null +++ b/Telegram/SourceFiles/platform/platform_launcher.h @@ -0,0 +1,43 @@ +/* +This file is part of Telegram Desktop, +the official desktop version of Telegram messaging app, see https://telegram.org + +Telegram Desktop is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +It is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +In addition, as a special exception, the copyright holders give permission +to link the code of portions of this program with the OpenSSL library. + +Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE +Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org +*/ +#pragma once + +namespace Platform { + +//class Launcher : public Core::Launcher { +//public: +// using Core::Launcher::Launcher; +// +// ... +// +//}; + +} // namespace Platform + +// Platform dependent implementations. + +#ifdef Q_OS_MAC +#include "platform/mac/launcher_mac.h" +#elif defined Q_OS_LINUX // Q_OS_MAC +#include "platform/linux/launcher_linux.h" +#elif defined Q_OS_WINRT || defined Q_OS_WIN // Q_OS_MAC || Q_OS_LINUX +#include "platform/win/launcher_win.h" +#endif // Q_OS_MAC || Q_OS_LINUX || Q_OS_WINRT || Q_OS_WIN diff --git a/Telegram/SourceFiles/platform/win/launcher_win.cpp b/Telegram/SourceFiles/platform/win/launcher_win.cpp new file mode 100644 index 000000000..cc85d0c9f --- /dev/null +++ b/Telegram/SourceFiles/platform/win/launcher_win.cpp @@ -0,0 +1,28 @@ +/* +This file is part of Telegram Desktop, +the official desktop version of Telegram messaging app, see https://telegram.org + +Telegram Desktop is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +It is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +In addition, as a special exception, the copyright holders give permission +to link the code of portions of this program with the OpenSSL library. + +Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE +Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org +*/ +#include "platform/win/launcher_win.h" + +namespace Platform { + +void Launcher::initHook() { +} + +} // namespace diff --git a/Telegram/SourceFiles/platform/win/launcher_win.h b/Telegram/SourceFiles/platform/win/launcher_win.h new file mode 100644 index 000000000..9ff229828 --- /dev/null +++ b/Telegram/SourceFiles/platform/win/launcher_win.h @@ -0,0 +1,36 @@ +/* +This file is part of Telegram Desktop, +the official desktop version of Telegram messaging app, see https://telegram.org + +Telegram Desktop is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +It is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +In addition, as a special exception, the copyright holders give permission +to link the code of portions of this program with the OpenSSL library. + +Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE +Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org +*/ +#pragma once + +#include "core/launcher.h" + +namespace Platform { + +class Launcher : public Core::Launcher { +public: + using Core::Launcher::Launcher; + +private: + void initHook() override; + +}; + +} // namespace Platform diff --git a/Telegram/SourceFiles/platform/win/specific_win.cpp b/Telegram/SourceFiles/platform/win/specific_win.cpp index eef41923b..edefd2e4d 100644 --- a/Telegram/SourceFiles/platform/win/specific_win.cpp +++ b/Telegram/SourceFiles/platform/win/specific_win.cpp @@ -32,6 +32,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "storage/localstorage.h" #include "passcodewidget.h" #include "base/task_queue.h" +#include "core/crash_reports.h" #include #include @@ -687,7 +688,7 @@ void psExecTelegram(const QString &crashreport) { DEBUG_LOG(("Application Info: executing %1 %2").arg(cExeDir() + cExeName()).arg(targs)); Logs::closeMain(); - SignalHandlers::finish(); + CrashReports::Finish(); HINSTANCE r = ShellExecute(0, 0, telegram.toStdWString().c_str(), targs.toStdWString().c_str(), wdir.isEmpty() ? 0 : wdir.toStdWString().c_str(), SW_SHOWNORMAL); if (long(r) < 32) { DEBUG_LOG(("Application Error: failed to execute %1, working directory: '%2', result: %3").arg(telegram).arg(wdir).arg(long(r))); @@ -1291,7 +1292,7 @@ QString psPrepareCrashDump(const QByteArray &crashdump, QString dumpfile) { void psWriteStackTrace() { #ifndef TDESKTOP_DISABLE_CRASH_REPORTS if (!LoadDbgHelp()) { - SignalHandlers::dump() << "ERROR: Could not load dbghelp.dll!\n"; + CrashReports::dump() << "ERROR: Could not load dbghelp.dll!\n"; return; } @@ -1348,17 +1349,17 @@ void psWriteStackTrace() { // deeper frame could not be found. // CONTEXT need not to be suplied if imageTyp is IMAGE_FILE_MACHINE_I386! if (!stackWalk64(imageType, hProcess, hThread, &s, &c, ReadProcessMemoryRoutine64, symFunctionTableAccess64, symGetModuleBase64, NULL)) { - SignalHandlers::dump() << "ERROR: Call to StackWalk64() failed!\n"; + CrashReports::dump() << "ERROR: Call to StackWalk64() failed!\n"; return; } if (s.AddrPC.Offset == s.AddrReturn.Offset) { - SignalHandlers::dump() << s.AddrPC.Offset << "\n"; - SignalHandlers::dump() << "ERROR: StackWalk64() endless callstack!"; + CrashReports::dump() << s.AddrPC.Offset << "\n"; + CrashReports::dump() << "ERROR: StackWalk64() endless callstack!"; return; } if (s.AddrPC.Offset != 0) { // we seem to have a valid PC - SignalHandlers::dump() << s.AddrPC.Offset << "\n"; + CrashReports::dump() << s.AddrPC.Offset << "\n"; } if (s.AddrReturn.Offset == 0) { diff --git a/Telegram/SourceFiles/settings.cpp b/Telegram/SourceFiles/settings.cpp index 2268a6b0d..15b02e76b 100644 --- a/Telegram/SourceFiles/settings.cpp +++ b/Telegram/SourceFiles/settings.cpp @@ -20,14 +20,9 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #include "settings.h" -#include "platform/platform_specific.h" -#include "data/data_document.h" - bool gRtl = false; Qt::LayoutDirection gLangDir = gRtl ? Qt::RightToLeft : Qt::LeftToRight; -QString gArguments; - bool gAlphaVersion = AppAlphaVersion; uint64 gBetaVersion = AppBetaVersion; uint64 gRealBetaVersion = AppBetaVersion; @@ -168,7 +163,8 @@ void ParseCommandLineArguments(const QStringList &arguments) { gKeyFile = parseResult.value("-key", QStringList()).join(QString()); gLaunchMode = parseResult.contains("-autostart") ? LaunchModeAutoStart : parseResult.contains("-fixprevious") ? LaunchModeFixPrevious - : parseResult.contains("-cleanup") ? LaunchModeCleanup : LaunchModeNormal; + : parseResult.contains("-cleanup") ? LaunchModeCleanup + : LaunchModeNormal; gNoStartUpdate = parseResult.contains("-noupdate"); gStartToSettings = parseResult.contains("-tosettings"); gStartInTray = parseResult.contains("-startintray"); @@ -182,13 +178,11 @@ void ParseCommandLineArguments(const QStringList &arguments) { void InitFromCommandLine(int argc, char *argv[]) { Expects(argc >= 0); - auto arguments = QStringList(); arguments.reserve(argc); for (auto i = 0; i != argc; ++i) { arguments.push_back(fromUtf8Safe(argv[i])); } - gArguments = arguments.join(' '); #ifdef Q_OS_MAC #ifndef OS_MAC_OLD @@ -252,20 +246,3 @@ void InitFromCommandLine(int argc, char *argv[]) { ParseCommandLineArguments(arguments); } - -RecentStickerPack &cGetRecentStickers() { - if (cRecentStickers().isEmpty() && !cRecentStickersPreload().isEmpty()) { - RecentStickerPreload p(cRecentStickersPreload()); - cSetRecentStickersPreload(RecentStickerPreload()); - - RecentStickerPack &recent(cRefRecentStickers()); - recent.reserve(p.size()); - for (RecentStickerPreload::const_iterator i = p.cbegin(), e = p.cend(); i != e; ++i) { - DocumentData *doc = App::document(i->first); - if (!doc || !doc->sticker()) continue; - - recent.push_back(qMakePair(doc, i->second)); - } - } - return cRefRecentStickers(); -} diff --git a/Telegram/SourceFiles/settings.h b/Telegram/SourceFiles/settings.h index 9c024c932..924cab829 100644 --- a/Telegram/SourceFiles/settings.h +++ b/Telegram/SourceFiles/settings.h @@ -20,8 +20,6 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once -void InitFromCommandLine(int argc, char *argv[]); - extern bool gDebug; inline bool cDebug() { #if defined _DEBUG @@ -55,8 +53,6 @@ inline bool rtl() { return cRtl(); } -DeclareReadSetting(QString, Arguments); - DeclareSetting(bool, AlphaVersion); DeclareSetting(uint64, BetaVersion); DeclareSetting(uint64, RealBetaVersion); @@ -169,15 +165,13 @@ DeclareRefSetting(EmojiColorVariants, EmojiVariants); class DocumentData; -typedef QList > RecentStickerPackOld; -typedef QVector > RecentStickerPreload; -typedef QVector > RecentStickerPack; +typedef QList> RecentStickerPackOld; +typedef QVector> RecentStickerPreload; +typedef QVector> RecentStickerPack; DeclareSetting(RecentStickerPreload, RecentStickersPreload); DeclareRefSetting(RecentStickerPack, RecentStickers); -RecentStickerPack &cGetRecentStickers(); - -typedef QList > RecentHashtagPack; +typedef QList> RecentHashtagPack; DeclareRefSetting(RecentHashtagPack, RecentWriteHashtags); DeclareSetting(RecentHashtagPack, RecentSearchHashtags); @@ -203,41 +197,6 @@ inline bool passcodeCanTry() { return dt >= 30000; } -inline void incrementRecentHashtag(RecentHashtagPack &recent, const QString &tag) { - RecentHashtagPack::iterator i = recent.begin(), e = recent.end(); - for (; i != e; ++i) { - if (i->first == tag) { - ++i->second; - if (qAbs(i->second) > 0x4000) { - for (RecentHashtagPack::iterator j = recent.begin(); j != e; ++j) { - if (j->second > 1) { - j->second /= 2; - } else if (j->second > 0) { - j->second = 1; - } - } - } - for (; i != recent.begin(); --i) { - if (qAbs((i - 1)->second) > qAbs(i->second)) { - break; - } - qSwap(*i, *(i - 1)); - } - break; - } - } - if (i == e) { - while (recent.size() >= 64) recent.pop_back(); - recent.push_back(qMakePair(tag, 1)); - for (i = recent.end() - 1; i != recent.begin(); --i) { - if ((i - 1)->second > i->second) { - break; - } - qSwap(*i, *(i - 1)); - } - } -} - DeclareSetting(QStringList, SendPaths); DeclareSetting(QString, StartUrl); @@ -271,5 +230,3 @@ DeclareSetting(int32, AutoDownloadPhoto); DeclareSetting(int32, AutoDownloadAudio); DeclareSetting(int32, AutoDownloadGif); DeclareSetting(bool, AutoPlayGif); - -void settingsParseArgs(int argc, char *argv[]); diff --git a/Telegram/SourceFiles/storage/file_download.cpp b/Telegram/SourceFiles/storage/file_download.cpp index bf139ed2f..63505b7f3 100644 --- a/Telegram/SourceFiles/storage/file_download.cpp +++ b/Telegram/SourceFiles/storage/file_download.cpp @@ -27,6 +27,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "storage/localstorage.h" #include "platform/platform_file_utilities.h" #include "auth_session.h" +#include "core/crash_reports.h" namespace Storage { @@ -722,11 +723,11 @@ bool mtpFileLoader::feedPart(int offset, base::const_byte_span bytes) { // Debugging weird out of memory crashes. auto info = QString("offset: %1, size: %2, cancelled: %3, finished: %4, filename: '%5', tocache: %6, fromcloud: %7, data: %8, fullsize: %9").arg(offset).arg(bytes.size()).arg(Logs::b(_cancelled)).arg(Logs::b(_finished)).arg(_filename).arg(int(_toCache)).arg(int(_fromCloud)).arg(_data.size()).arg(_size); info += QString(", locationtype: %1, inqueue: %2, localstatus: %3").arg(int(_locationType)).arg(Logs::b(_inQueue)).arg(int(_localStatus)); - SignalHandlers::setCrashAnnotation("DebugInfo", info); + CrashReports::SetAnnotation("DebugInfo", info); } _data.reserve(offset + bytes.size()); if (offset > 100 * 1024 * 1024) { - SignalHandlers::setCrashAnnotation("DebugInfo", QString()); + CrashReports::ClearAnnotation("DebugInfo"); } if (offset > _data.size()) { diff --git a/Telegram/SourceFiles/storage/localstorage.cpp b/Telegram/SourceFiles/storage/localstorage.cpp index 1e422b451..8f9160b4c 100644 --- a/Telegram/SourceFiles/storage/localstorage.cpp +++ b/Telegram/SourceFiles/storage/localstorage.cpp @@ -22,6 +22,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "storage/serialize_document.h" #include "storage/serialize_common.h" +#include "chat_helpers/stickers.h" #include "data/data_drafts.h" #include "window/themes/window_theme.h" #include "observer_peer.h" @@ -1778,7 +1779,7 @@ void _writeUserSettings() { } size += sizeof(quint32) + sizeof(qint32) + cEmojiVariants().size() * (sizeof(uint32) + sizeof(uint64)); - size += sizeof(quint32) + sizeof(qint32) + (cRecentStickersPreload().isEmpty() ? cGetRecentStickers().size() : cRecentStickersPreload().size()) * (sizeof(uint64) + sizeof(ushort)); + size += sizeof(quint32) + sizeof(qint32) + (Stickers::GetRecentPack().isEmpty() ? Stickers::GetRecentPack().size() : cRecentStickersPreload().size()) * (sizeof(uint64) + sizeof(ushort)); size += sizeof(quint32) + Serialize::stringSize(cDialogLastPath()); size += sizeof(quint32) + 3 * sizeof(qint32); size += sizeof(quint32) + 2 * sizeof(qint32); @@ -1822,11 +1823,11 @@ void _writeUserSettings() { } data.stream << quint32(dbiEmojiVariants) << cEmojiVariants(); { - RecentStickerPreload v(cRecentStickersPreload()); + auto v = cRecentStickersPreload(); if (v.isEmpty()) { - v.reserve(cGetRecentStickers().size()); - for (RecentStickerPack::const_iterator i = cGetRecentStickers().cbegin(), e = cGetRecentStickers().cend(); i != e; ++i) { - v.push_back(qMakePair(i->first->id, i->second)); + v.reserve(Stickers::GetRecentPack().size()); + for_const (auto &pair, Stickers::GetRecentPack()) { + v.push_back(qMakePair(pair.first->id, pair.second)); } } data.stream << quint32(dbiRecentStickers) << v; diff --git a/Telegram/SourceFiles/ui/text/text_block.cpp b/Telegram/SourceFiles/ui/text/text_block.cpp index f89644e1d..e435b50dc 100644 --- a/Telegram/SourceFiles/ui/text/text_block.cpp +++ b/Telegram/SourceFiles/ui/text/text_block.cpp @@ -20,6 +20,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #include "ui/text/text_block.h" +#include "core/crash_reports.h" + // COPIED FROM qtextlayout.cpp AND MODIFIED namespace { @@ -327,7 +329,7 @@ TextBlock::TextBlock(const style::font &font, const QString &str, QFixed minResi QString part = str.mid(_from, length); // Attempt to catch a crash in text processing - SignalHandlers::setCrashAnnotationRef("CrashString", &part); + CrashReports::SetAnnotationRef("CrashString", &part); QStackTextEngine engine(part, blockFont->f); QTextLayout layout(&engine); @@ -338,7 +340,7 @@ TextBlock::TextBlock(const style::font &font, const QString &str, QFixed minResi layout.endLayout(); - SignalHandlers::clearCrashAnnotationRef("CrashString"); + CrashReports::ClearAnnotationRef("CrashString"); } } diff --git a/Telegram/build/build.sh b/Telegram/build/build.sh index a235c5965..5634f7b6c 100755 --- a/Telegram/build/build.sh +++ b/Telegram/build/build.sh @@ -398,3 +398,8 @@ if [ "$BuildTarget" == "mac" ] || [ "$BuildTarget" == "mac32" ] || [ "$BuildTarg fi echo "Version $AppVersionStrFull is ready!"; +echo -en "\007"; +sleep 1; +echo -en "\007"; +sleep 1; +echo -en "\007"; diff --git a/Telegram/gyp/telegram_sources.txt b/Telegram/gyp/telegram_sources.txt index e90614dae..bbf2b2ade 100644 --- a/Telegram/gyp/telegram_sources.txt +++ b/Telegram/gyp/telegram_sources.txt @@ -141,8 +141,14 @@ <(src_loc)/core/click_handler.h <(src_loc)/core/click_handler_types.cpp <(src_loc)/core/click_handler_types.h +<(src_loc)/core/crash_report_window.cpp +<(src_loc)/core/crash_report_window.h +<(src_loc)/core/crash_reports.cpp +<(src_loc)/core/crash_reports.h <(src_loc)/core/file_utilities.cpp <(src_loc)/core/file_utilities.h +<(src_loc)/core/launcher.cpp +<(src_loc)/core/launcher.h <(src_loc)/core/single_timer.cpp <(src_loc)/core/single_timer.h <(src_loc)/core/tl_help.h @@ -398,6 +404,8 @@ <(src_loc)/platform/linux/linux_libs.h <(src_loc)/platform/linux/file_utilities_linux.cpp <(src_loc)/platform/linux/file_utilities_linux.h +<(src_loc)/platform/linux/launcher_linux.cpp +<(src_loc)/platform/linux/launcher_linux.h <(src_loc)/platform/linux/main_window_linux.cpp <(src_loc)/platform/linux/main_window_linux.h <(src_loc)/platform/linux/notifications_manager_linux.cpp @@ -406,6 +414,8 @@ <(src_loc)/platform/linux/specific_linux.h <(src_loc)/platform/mac/file_utilities_mac.mm <(src_loc)/platform/mac/file_utilities_mac.h +<(src_loc)/platform/mac/launcher_mac.mm +<(src_loc)/platform/mac/launcher_mac.h <(src_loc)/platform/mac/mac_iconv_helper.c <(src_loc)/platform/mac/mac_utilities.mm <(src_loc)/platform/mac/mac_utilities.h @@ -423,6 +433,8 @@ <(src_loc)/platform/win/audio_win.h <(src_loc)/platform/win/file_utilities_win.cpp <(src_loc)/platform/win/file_utilities_win.h +<(src_loc)/platform/win/launcher_win.cpp +<(src_loc)/platform/win/launcher_win.h <(src_loc)/platform/win/main_window_win.cpp <(src_loc)/platform/win/main_window_win.h <(src_loc)/platform/win/notifications_manager_win.cpp @@ -440,6 +452,7 @@ <(src_loc)/platform/win/windows_range_v3_helpers.h <(src_loc)/platform/platform_audio.h <(src_loc)/platform/platform_file_utilities.h +<(src_loc)/platform/platform_launcher.h <(src_loc)/platform/platform_main_window.h <(src_loc)/platform/platform_notifications_manager.h <(src_loc)/platform/platform_specific.h