From 340246367dc6256aafa2220aeed7d8fcee0a6ef6 Mon Sep 17 00:00:00 2001 From: John Preston Date: Sat, 30 Jan 2016 21:24:18 +0300 Subject: [PATCH] crash report and show done for os x --- Telegram/SourceFiles/_other/updater_osx.m | 25 ++-- Telegram/SourceFiles/application.cpp | 11 +- Telegram/SourceFiles/application.h | 1 - Telegram/SourceFiles/autoupdater.cpp | 4 +- Telegram/SourceFiles/boxes/aboutbox.cpp | 2 +- Telegram/SourceFiles/boxes/addcontactbox.cpp | 2 +- Telegram/SourceFiles/boxes/confirmbox.cpp | 2 +- Telegram/SourceFiles/boxes/usernamebox.cpp | 2 +- Telegram/SourceFiles/historywidget.cpp | 21 ++++ Telegram/SourceFiles/logs.cpp | 31 ++++- Telegram/SourceFiles/logs.h | 5 +- Telegram/SourceFiles/pspecific_mac.cpp | 126 +++++++++++++++++-- Telegram/SourceFiles/pspecific_mac.h | 6 +- Telegram/SourceFiles/pspecific_mac_p.h | 4 +- Telegram/SourceFiles/pspecific_mac_p.mm | 22 ++-- Telegram/SourceFiles/structs.h | 4 +- Telegram/SourceFiles/title.cpp | 7 +- Telegram/SourceFiles/window.cpp | 8 +- 18 files changed, 227 insertions(+), 56 deletions(-) diff --git a/Telegram/SourceFiles/_other/updater_osx.m b/Telegram/SourceFiles/_other/updater_osx.m index 4c3e7c4fb..ea34527f4 100644 --- a/Telegram/SourceFiles/_other/updater_osx.m +++ b/Telegram/SourceFiles/_other/updater_osx.m @@ -23,6 +23,7 @@ Copyright (c) 2014-2015 John Preston, https://desktop.telegram.org NSString *appName = @"Telegram.app"; NSString *appDir = nil; NSString *workDir = nil; +NSString *crashReportArg = nil; #ifdef _DEBUG BOOL _debug = YES; @@ -101,6 +102,10 @@ int main(int argc, const char * argv[]) { [formatter setNumberStyle:NSNumberFormatterDecimalStyle]; procId = [[formatter numberFromString:[NSString stringWithUTF8String:argv[i]]] intValue]; } + } else if ([@"-crashreport" isEqualToString:[NSString stringWithUTF8String:argv[i]]]) { + if (++i < argc) { + crashReportArg = [NSString stringWithUTF8String:argv[i]]; + } } else if ([@"-noupdate" isEqualToString:[NSString stringWithUTF8String:argv[i]]]) { update = NO; } else if ([@"-tosettings" isEqualToString:[NSString stringWithUTF8String:argv[i]]]) { @@ -214,15 +219,17 @@ int main(int argc, const char * argv[]) { } NSString *appPath = [[NSArray arrayWithObjects:appDir, appRealName, nil] componentsJoinedByString:@""]; - NSMutableArray *args = [[NSMutableArray alloc] initWithObjects:@"-noupdate", nil]; - if (toSettings) [args addObject:@"-tosettings"]; - if (_debug) [args addObject:@"-debug"]; - if (startInTray) [args addObject:@"-startintray"]; - if (testMode) [args addObject:@"-testmode"]; - if (autoStart) [args addObject:@"-autostart"]; - if (key) { - [args addObject:@"-key"]; - [args addObject:key]; + NSMutableArray *args = [[NSMutableArray alloc] initWithObjects: crashReportArg ? crashReportArg : @"-noupdate", nil]; + if (!crashReportArg) { + if (toSettings) [args addObject:@"-tosettings"]; + if (_debug) [args addObject:@"-debug"]; + if (startInTray) [args addObject:@"-startintray"]; + if (testMode) [args addObject:@"-testmode"]; + if (autoStart) [args addObject:@"-autostart"]; + if (key) { + [args addObject:@"-key"]; + [args addObject:key]; + } } writeLog([[NSArray arrayWithObjects:@"Running application '", appPath, @"' with args '", [args componentsJoinedByString:@"' '"], @"'..", nil] componentsJoinedByString:@""]); NSError *error = nil; diff --git a/Telegram/SourceFiles/application.cpp b/Telegram/SourceFiles/application.cpp index 6149620a9..6ac2a77b6 100644 --- a/Telegram/SourceFiles/application.cpp +++ b/Telegram/SourceFiles/application.cpp @@ -151,6 +151,8 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv) connect(&_localSocket, SIGNAL(readyRead()), this, SLOT(socketReading())); connect(&_localServer, SIGNAL(newConnection()), this, SLOT(newInstanceConnected())); + connect(this, SIGNAL(aboutToQuit()), this, SLOT(closeApplication())); + #ifndef TDESKTOP_DISABLE_AUTOUPDATE connect(&_updateCheckTimer, SIGNAL(timeout()), this, SLOT(updateCheck())); connect(this, SIGNAL(updateFailed()), this, SLOT(onUpdateFailed())); @@ -531,12 +533,6 @@ inline Application *application() { namespace Sandboxer { - void setClipboardText(const QString &text) { - if (Application *a = application()) { - a->clipboard()->setText(text); - } - } - QRect availableGeometry() { if (Application *a = application()) { return a->desktop()->availableGeometry(); @@ -724,8 +720,7 @@ AppClass::AppClass() : QObject() application()->installNativeEventFilter(psNativeEventFilter()); - connect(this, SIGNAL(aboutToQuit()), this, SLOT(closeApplication())); - connect(this, SIGNAL(applicationStateChanged(Qt::ApplicationState)), this, SLOT(onAppStateChanged(Qt::ApplicationState))); + connect(application(), SIGNAL(applicationStateChanged(Qt::ApplicationState)), this, SLOT(onAppStateChanged(Qt::ApplicationState))); connect(&_mtpUnpauseTimer, SIGNAL(timeout()), this, SLOT(doMtpUnpause())); diff --git a/Telegram/SourceFiles/application.h b/Telegram/SourceFiles/application.h index 940f83819..26b443955 100644 --- a/Telegram/SourceFiles/application.h +++ b/Telegram/SourceFiles/application.h @@ -107,7 +107,6 @@ private: namespace Sandboxer { - void setClipboardText(const QString &text); QRect availableGeometry(); QRect screenGeometry(const QPoint &p); void setActiveWindow(QWidget *window); diff --git a/Telegram/SourceFiles/autoupdater.cpp b/Telegram/SourceFiles/autoupdater.cpp index 7c4796585..17528d79f 100644 --- a/Telegram/SourceFiles/autoupdater.cpp +++ b/Telegram/SourceFiles/autoupdater.cpp @@ -558,12 +558,12 @@ bool checkReadyUpdate() { QDir().mkpath(QFileInfo(curUpdater).absolutePath()); DEBUG_LOG(("Update Info: moving %1 to %2..").arg(updater.absoluteFilePath()).arg(curUpdater)); if (!objc_moveFile(updater.absoluteFilePath(), curUpdater)) { - UpdateDownloader::clearAll(); + UpdateChecker::clearAll(); return false; } #elif defined Q_OS_LINUX if (!linuxMoveFile(QFile::encodeName(updater.absoluteFilePath()).constData(), QFile::encodeName(curUpdater).constData())) { - UpdateDownloader::clearAll(); + UpdateChecker::clearAll(); return false; } #endif diff --git a/Telegram/SourceFiles/boxes/aboutbox.cpp b/Telegram/SourceFiles/boxes/aboutbox.cpp index 357410b5e..79b8c7249 100644 --- a/Telegram/SourceFiles/boxes/aboutbox.cpp +++ b/Telegram/SourceFiles/boxes/aboutbox.cpp @@ -82,7 +82,7 @@ void AboutBox::onVersion() { } url = url.arg(qsl("tbeta%1_%2").arg(cRealBetaVersion()).arg(countBetaVersionSignature(cRealBetaVersion()))); - Sandboxer::setClipboardText(url); + Application::clipboard()->setText(url); Ui::showLayer(new InformBox("The link to the current private beta version of Telegram Desktop was copied to the clipboard.")); } else { diff --git a/Telegram/SourceFiles/boxes/addcontactbox.cpp b/Telegram/SourceFiles/boxes/addcontactbox.cpp index 7db72e9a6..c2d94321a 100644 --- a/Telegram/SourceFiles/boxes/addcontactbox.cpp +++ b/Telegram/SourceFiles/boxes/addcontactbox.cpp @@ -750,7 +750,7 @@ void SetupChannelBox::mouseMoveEvent(QMouseEvent *e) { void SetupChannelBox::mousePressEvent(QMouseEvent *e) { mouseMoveEvent(e); if (_linkOver) { - Sandboxer::setClipboardText(_channel->invitationUrl); + Application::clipboard()->setText(_channel->invitationUrl); _goodTextLink = lang(lng_create_channel_link_copied); a_goodOpacity = anim::fvalue(1, 0); _a_goodFade.start(); diff --git a/Telegram/SourceFiles/boxes/confirmbox.cpp b/Telegram/SourceFiles/boxes/confirmbox.cpp index af570091d..b619af265 100644 --- a/Telegram/SourceFiles/boxes/confirmbox.cpp +++ b/Telegram/SourceFiles/boxes/confirmbox.cpp @@ -212,7 +212,7 @@ void MaxInviteBox::mouseMoveEvent(QMouseEvent *e) { void MaxInviteBox::mousePressEvent(QMouseEvent *e) { mouseMoveEvent(e); if (_linkOver) { - Sandboxer::setClipboardText(_link); + Application::clipboard()->setText(_link); _goodTextLink = lang(lng_create_channel_link_copied); a_goodOpacity = anim::fvalue(1, 0); _a_good.start(); diff --git a/Telegram/SourceFiles/boxes/usernamebox.cpp b/Telegram/SourceFiles/boxes/usernamebox.cpp index fa40dcfe9..b0f11ba74 100644 --- a/Telegram/SourceFiles/boxes/usernamebox.cpp +++ b/Telegram/SourceFiles/boxes/usernamebox.cpp @@ -191,7 +191,7 @@ void UsernameBox::onChanged() { } void UsernameBox::onLinkClick() { - Sandboxer::setClipboardText(qsl("https://telegram.me/") + getName()); + Application::clipboard()->setText(qsl("https://telegram.me/") + getName()); _copiedTextLink = lang(lng_username_copied); update(); } diff --git a/Telegram/SourceFiles/historywidget.cpp b/Telegram/SourceFiles/historywidget.cpp index e58661c29..66eb87068 100644 --- a/Telegram/SourceFiles/historywidget.cpp +++ b/Telegram/SourceFiles/historywidget.cpp @@ -4804,8 +4804,22 @@ void HistoryWidget::onDocumentSelect() { } } +QString _getCrashReportFile(const QMimeData *m) { + if (!m || m->urls().size() != 1) return QString(); + + QString file(m->urls().at(0).toLocalFile()); + if (file.startsWith(qsl("/.file/id="))) file = psConvertFileUrl(file); + + return file.endsWith(qstr(".telegramcrash"), Qt::CaseInsensitive) ? file : QString(); +} void HistoryWidget::dragEnterEvent(QDragEnterEvent *e) { + if (!_peer && !_getCrashReportFile(e->mimeData()).isEmpty()) { + e->setDropAction(Qt::CopyAction); + e->accept(); + return; + } + if (!_history) return; if (_peer && (_peer->isChannel() && !_peer->asChannel()->canPublish())) return; @@ -5127,6 +5141,13 @@ bool HistoryWidget::kbWasHidden() const { } void HistoryWidget::dropEvent(QDropEvent *e) { + if (!_peer && !_getCrashReportFile(e->mimeData()).isEmpty()) { + e->acceptProposedAction(); + psExecTelegram(_getCrashReportFile(e->mimeData())); + App::quit(); + return; + } + _attachDrag = DragStateNone; updateDragAreas(); e->acceptProposedAction(); diff --git a/Telegram/SourceFiles/logs.cpp b/Telegram/SourceFiles/logs.cpp index 94a7e5add..24aa69849 100644 --- a/Telegram/SourceFiles/logs.cpp +++ b/Telegram/SourceFiles/logs.cpp @@ -108,7 +108,7 @@ private: QSharedPointer files[LogDataCount]; QTextStream streams[LogDataCount]; - int32 part = -1, index = 0; + int32 part = -1; bool reopen(LogDataType type, int32 dayIndex, const QString &postfix) { if (streams[type].device()) { @@ -596,14 +596,31 @@ namespace SignalHandlers { return _writeNumber(stream, num); } - const dump &operator<<(const dump &stream, DWORD num) { + const dump &operator<<(const dump &stream, uint32 num) { return _writeNumber(stream, num); } - const dump &operator<<(const dump &stream, DWORD64 num) { + const dump &operator<<(const dump &stream, uint64 num) { return _writeNumber(stream, num); } + const dump &operator<<(const dump &stream, double num) { + if (num < 0) { + _writeChar('-'); + num = -num; + } + _writeNumber(stream, uint64(floor(num))); + _writeChar('.'); + num -= floor(num); + for (int i = 0; i < 4; ++i) { + num *= 10; + int digit = int(floor(num)); + _writeChar('0' + digit); + num -= digit; + } + return stream; + } + Qt::HANDLE LoggingCrashThreadId = 0; bool LoggingCrashHeaderWritten = false; QMutex LoggingCrashMutex; @@ -665,6 +682,10 @@ namespace SignalHandlers { dump() << "\n"; LoggingCrashThreadId = 0; + +#ifndef Q_OS_WIN + exit(1); +#endif } Status start() { @@ -697,11 +718,11 @@ namespace SignalHandlers { CrashDumpFileNo = fileno(CrashDumpFile); QByteArray launchedDateTime = QDateTime::currentDateTime().toString("dd.MM.yyyy hh:mm:ss").toUtf8(); - t_assert(launchedDateTime.size() < sizeof(LaunchedDateTimeStr)); + t_assert(launchedDateTime.size() < int(sizeof(LaunchedDateTimeStr))); memcpy(LaunchedDateTimeStr, launchedDateTime.constData(), launchedDateTime.size()); QByteArray launchedBinaryName = cExeName().toUtf8(); - t_assert(launchedBinaryName.size() < sizeof(LaunchedBinaryName)); + t_assert(launchedBinaryName.size() < int(sizeof(LaunchedBinaryName))); memcpy(LaunchedBinaryName, launchedBinaryName.constData(), launchedBinaryName.size()); signal(SIGABRT, SignalHandlers::Handler); diff --git a/Telegram/SourceFiles/logs.h b/Telegram/SourceFiles/logs.h index 80282ef4c..422110709 100644 --- a/Telegram/SourceFiles/logs.h +++ b/Telegram/SourceFiles/logs.h @@ -93,8 +93,9 @@ namespace SignalHandlers { }; const dump &operator<<(const dump &stream, const char *str); const dump &operator<<(const dump &stream, int num); - const dump &operator<<(const dump &stream, DWORD num); - const dump &operator<<(const dump &stream, DWORD64 num); + const dump &operator<<(const dump &stream, uint32 num); + const dump &operator<<(const dump &stream, uint64 num); + const dump &operator<<(const dump &stream, double num); enum Status { CantOpen, diff --git a/Telegram/SourceFiles/pspecific_mac.cpp b/Telegram/SourceFiles/pspecific_mac.cpp index f27e29dd3..a07e04425 100644 --- a/Telegram/SourceFiles/pspecific_mac.cpp +++ b/Telegram/SourceFiles/pspecific_mac.cpp @@ -26,6 +26,8 @@ Copyright (c) 2014-2015 John Preston, https://desktop.telegram.org #include "localstorage.h" #include "passcodewidget.h" +#include + namespace { QStringList _initLogs; @@ -38,7 +40,7 @@ namespace { } bool nativeEventFilter(const QByteArray &eventType, void *message, long *result) { - Window *wnd = Application::wnd(); + Window *wnd = AppClass::wnd(); if (!wnd) return false; return wnd->psFilterNativeEvent(message); @@ -213,7 +215,7 @@ void PsMainWindow::psInitSize() { bool maximized = false; QRect geom(avail.x() + (avail.width() - st::wndDefWidth) / 2, avail.y() + (avail.height() - st::wndDefHeight) / 2, st::wndDefWidth, st::wndDefHeight); if (pos.w && pos.h) { - QList screens = App::app()->screens(); + QList screens = Application::screens(); for (QList::const_iterator i = screens.cbegin(), e = screens.cend(); i != e; ++i) { QByteArray name = (*i)->name().toUtf8(); if (pos.moncrc == hashCrc32(name.constData(), name.size())) { @@ -266,7 +268,7 @@ void PsMainWindow::psSavePosition(Qt::WindowState state) { int px = curPos.x + curPos.w / 2, py = curPos.y + curPos.h / 2, d = 0; QScreen *chosen = 0; - QList screens = App::app()->screens(); + QList screens = Application::screens(); for (QList::const_iterator i = screens.cbegin(), e = screens.cend(); i != e; ++i) { int dx = (*i)->geometry().x() + (*i)->geometry().width() / 2 - px; if (dx < 0) dx = -dx; int dy = (*i)->geometry().y() + (*i)->geometry().height() / 2 - py; if (dy < 0) dy = -dy; @@ -422,13 +424,13 @@ void PsMainWindow::psMacUpdateMenu() { canSelectAll = !edit->text().isEmpty(); canUndo = edit->isUndoAvailable(); canRedo = edit->isRedoAvailable(); - canPaste = !App::app()->clipboard()->text().isEmpty(); + canPaste = !Application::clipboard()->text().isEmpty(); } else if (FlatTextarea *edit = qobject_cast(focused)) { canCut = canCopy = canDelete = edit->textCursor().hasSelection(); canSelectAll = !edit->getLastText().isEmpty(); canUndo = edit->isUndoAvailable(); canRedo = edit->isRedoAvailable(); - canPaste = !App::app()->clipboard()->text().isEmpty(); + canPaste = !Application::clipboard()->text().isEmpty(); } else if (HistoryInner *list = qobject_cast(focused)) { canCopy = list->canCopySelected(); canDelete = list->canDeleteSelected(); @@ -519,7 +521,115 @@ bool PsMainWindow::eventFilter(QObject *obj, QEvent *evt) { QAbstractNativeEventFilter *psNativeEventFilter() { delete _psEventFilter; _psEventFilter = new _PsEventFilter(); - installNativeEventFilter(_psEventFilter); + return _psEventFilter; +} + +void psWriteDump() { + double v = objc_appkitVersion(); + SignalHandlers::dump() << "OS-Version: " << v; +} + +void psWriteStackTrace(int file) { + void *addresses[1024] = { 0 }; + + size_t size = backtrace(addresses, 1024); + + backtrace_symbols_fd(addresses, size, file); +} + +QString demanglestr(const QString &mangled) { + QByteArray cmd = ("c++filt -n " + mangled).toUtf8(); + FILE *f = popen(cmd.constData(), "r"); + if (!f) return "BAD_SYMBOL_" + mangled; + + QString result; + char buffer[4096] = {0}; + while (!feof(f)) { + if (fgets(buffer, 4096, f) != NULL) { + result += buffer; + } + } + pclose(f); + return result.trimmed(); +} + +QString _showCrashDump(const QByteArray &crashdump, QString dumpfile) { + QString initial = QString::fromUtf8(crashdump), result; + QStringList lines = initial.split('\n'); + result.reserve(initial.size()); + int32 i = 0, l = lines.size(); + + while (i < l) { + for (; i < l; ++i) { + result.append(lines.at(i)).append('\n'); + QString line = lines.at(i).trimmed(); + if (line == qstr("Backtrace:")) { + ++i; + break; + } + } + + for (int32 start = i; i < l; ++i) { + QString line = lines.at(i).trimmed(); + if (line.isEmpty()) break; + + if (!QRegularExpression(qsl("^\\d+")).match(line).hasMatch()) { + if (!lines.at(i).startsWith(qstr("ERROR: "))) { + result.append(qstr("BAD LINE: ")); + } + result.append(line).append('\n'); + continue; + } + QStringList lst = line.split(' ', QString::SkipEmptyParts); + result.append(lst.at(0)).append(' '); + for (int j = 1, s = lst.size();;) { + if (lst.at(j).startsWith('_')) { + result.append(demanglestr(lst.at(j))); + if (++j < s) { + result.append(' '); + for (;;) { + result.append(lst.at(j)); + if (++j < s) { + result.append(' '); + } else { + break; + } + } + } + break; + } else if (j > 2) { + result.append(lst.at(j)); + } + if (++j < s) { + result.append(' '); + } else { + break; + } + } + result.append('\n'); + } + } + return result; +} + +int psShowCrash(const QString &crashdump) { + QString text; + + QFile dump(crashdump); + if (dump.open(QIODevice::ReadOnly)) { + text = qsl("Crash dump file '%1':\n\n").arg(QFileInfo(crashdump).absoluteFilePath()); + text += _showCrashDump(dump.readAll(), crashdump); + } else { + text = qsl("ERROR: could not read crash dump file '%1'").arg(QFileInfo(crashdump).absoluteFilePath()); + } + + QByteArray args[] = { "" }; + int a_argc = 1; + char *a_argv[1] = { args[0].data() }; + QApplication app(a_argc, a_argv); + + ShowCrashReportWindow wnd(text); + return app.exec(); } void psDeleteDir(const QString &dir) { @@ -666,8 +776,8 @@ void psExecUpdater() { } } -void psExecTelegram() { - objc_execTelegram(); +void psExecTelegram(const QString &crashreport) { + objc_execTelegram(crashreport); } void psAutoStart(bool start, bool silent) { diff --git a/Telegram/SourceFiles/pspecific_mac.h b/Telegram/SourceFiles/pspecific_mac.h index 19082eedd..c7b4793e9 100644 --- a/Telegram/SourceFiles/pspecific_mac.h +++ b/Telegram/SourceFiles/pspecific_mac.h @@ -140,6 +140,10 @@ private: }; +void psWriteDump(); +void psWriteStackTrace(int file); +int psShowCrash(const QString &crashdump); + void psDeleteDir(const QString &dir); void psUserActionDone(); @@ -171,7 +175,7 @@ int psCleanup(); int psFixPrevious(); void psExecUpdater(); -void psExecTelegram(); +void psExecTelegram(const QString &crashreport = QString()); bool psShowOpenWithMenu(int x, int y, const QString &file); diff --git a/Telegram/SourceFiles/pspecific_mac_p.h b/Telegram/SourceFiles/pspecific_mac_p.h index b55366c0a..9b0d3aaee 100644 --- a/Telegram/SourceFiles/pspecific_mac_p.h +++ b/Telegram/SourceFiles/pspecific_mac_p.h @@ -69,7 +69,7 @@ void objc_openFile(const QString &file, bool openwith); void objc_start(); void objc_finish(); bool objc_execUpdater(); -void objc_execTelegram(); +void objc_execTelegram(const QString &crashreport); void objc_registerCustomScheme(); @@ -77,6 +77,8 @@ void objc_activateProgram(WId winId); bool objc_moveFile(const QString &from, const QString &to); void objc_deleteDir(const QString &dir); +double objc_appkitVersion(); + QString objc_appDataPath(); QString objc_downloadPath(); QString objc_currentCountry(); diff --git a/Telegram/SourceFiles/pspecific_mac_p.mm b/Telegram/SourceFiles/pspecific_mac_p.mm index 0de2db7f8..ca7db5d83 100644 --- a/Telegram/SourceFiles/pspecific_mac_p.mm +++ b/Telegram/SourceFiles/pspecific_mac_p.mm @@ -211,7 +211,7 @@ public: NSNumber *instObj = [[notification userInfo] objectForKey:@"launch"]; unsigned long long instLong = instObj ? [instObj unsignedLongLongValue] : 0; DEBUG_LOG(("Received notification with instance %1").arg(instLong)); - if (instLong != Global::LaunchId()) { // other app instance notification + if (instLong != Sandbox::LaunchId()) { // other app instance notification return; } if (notification.activationType == NSUserNotificationActivationTypeReplied) { @@ -283,8 +283,8 @@ void PsMacWindowPrivate::showNotify(uint64 peer, int32 msgId, const QPixmap &pix NSUserNotification *notification = [[NSUserNotification alloc] init]; NSImage *img = qt_mac_create_nsimage(pix); - DEBUG_LOG(("Sending notification with userinfo: peer %1, msgId %2 and instance %3").arg(peer).arg(msgId).arg(Global::LaunchId())); - [notification setUserInfo:[NSDictionary dictionaryWithObjectsAndKeys:[NSNumber numberWithUnsignedLongLong:peer],@"peer",[NSNumber numberWithInt:msgId],@"msgid",[NSNumber numberWithUnsignedLongLong:Global::LaunchId()],@"launch",nil]]; + DEBUG_LOG(("Sending notification with userinfo: peer %1, msgId %2 and instance %3").arg(peer).arg(msgId).arg(Sandbox::LaunchId())); + [notification setUserInfo:[NSDictionary dictionaryWithObjectsAndKeys:[NSNumber numberWithUnsignedLongLong:peer],@"peer",[NSNumber numberWithInt:msgId],@"msgid",[NSNumber numberWithUnsignedLongLong:Sandbox::LaunchId()],@"launch",nil]]; [notification setTitle:QNSString(title).s()]; [notification setSubtitle:QNSString(subtitle).s()]; @@ -352,7 +352,7 @@ void PsMacWindowPrivate::clearNotifies(unsigned long long peer) { NSArray *notifies = [center deliveredNotifications]; for (id notify in notifies) { NSDictionary *dict = [notify userInfo]; - if ([[dict objectForKey:@"peer"] unsignedLongLongValue] == peer && [[dict objectForKey:@"launch"] unsignedLongLongValue] == Global::LaunchId()) { + if ([[dict objectForKey:@"peer"] unsignedLongLongValue] == peer && [[dict objectForKey:@"launch"] unsignedLongLongValue] == Sandbox::LaunchId()) { [center removeDeliveredNotification:notify]; } } @@ -950,7 +950,7 @@ void objc_registerCustomScheme() { #endif } -BOOL _execUpdater(BOOL update = YES) { +BOOL _execUpdater(BOOL update = YES, const QString &crashreport = QString()) { NSString *path = @"", *args = @""; @try { path = [[NSBundle mainBundle] bundlePath]; @@ -972,6 +972,10 @@ BOOL _execUpdater(BOOL update = YES) { [args addObject:@"-key"]; [args addObject:QNSString(cDataFile()).s()]; } + if (!crashreport.isEmpty()) { + [args addObject:@"-crashreport"]; + [args addObject:QNSString(crashreport).s()]; + } DEBUG_LOG(("Application Info: executing %1 %2").arg(objcString(path)).arg(objcString([args componentsJoinedByString:@" "]))); if (![NSTask launchedTaskWithLaunchPath:path arguments:args]) { @@ -992,8 +996,8 @@ bool objc_execUpdater() { return !!_execUpdater(); } -void objc_execTelegram() { - _execUpdater(NO); +void objc_execTelegram(const QString &crashreport) { + _execUpdater(NO, crashreport); } void objc_activateProgram(WId winId) { @@ -1027,6 +1031,10 @@ void objc_deleteDir(const QString &dir) { [[NSFileManager defaultManager] removeItemAtPath:QNSString(dir).s() error:nil]; } +double objc_appkitVersion() { + return NSAppKitVersionNumber; +} + QString objc_appDataPath() { NSURL *url = [[NSFileManager defaultManager] URLForDirectory:NSApplicationSupportDirectory inDomain:NSUserDomainMask appropriateForURL:nil create:YES error:nil]; if (url) { diff --git a/Telegram/SourceFiles/structs.h b/Telegram/SourceFiles/structs.h index 6bfa3bb70..66d2d6473 100644 --- a/Telegram/SourceFiles/structs.h +++ b/Telegram/SourceFiles/structs.h @@ -69,7 +69,7 @@ public: } return _index.loadAcquire() - 1; } - static const uint64 Bit() { + static uint64 Bit() { return (1 << Index()); } @@ -86,7 +86,7 @@ public: class InterfacesMetadata { public: - InterfacesMetadata(uint64 mask) : _mask(mask), size(0), last(64) { + InterfacesMetadata(uint64 mask) : size(0), last(64), _mask(mask) { for (int i = 0; i < 64; ++i) { uint64 m = (1 << i); if (_mask & m) { diff --git a/Telegram/SourceFiles/title.cpp b/Telegram/SourceFiles/title.cpp index 86c55de51..081c05f5a 100644 --- a/Telegram/SourceFiles/title.cpp +++ b/Telegram/SourceFiles/title.cpp @@ -89,9 +89,10 @@ TitleWidget::TitleWidget(Window *window) : TWidget(window) connect(&_contacts, SIGNAL(clicked()), this, SLOT(onContacts())); connect(&_about, SIGNAL(clicked()), this, SLOT(onAbout())); connect(wnd->windowHandle(), SIGNAL(windowStateChanged(Qt::WindowState)), this, SLOT(stateChanged(Qt::WindowState))); - #ifndef TDESKTOP_DISABLE_AUTOUPDATE - connect(App::app(), SIGNAL(updateReady()), this, SLOT(showUpdateBtn())); - #endif + +#ifndef TDESKTOP_DISABLE_AUTOUPDATE + Sandboxer::connect(SIGNAL(updateReady()), this, SLOT(showUpdateBtn())); +#endif if (cPlatform() != dbipWindows) { _minimize.hide(); diff --git a/Telegram/SourceFiles/window.cpp b/Telegram/SourceFiles/window.cpp index e54c8e274..e3c2fe3fb 100644 --- a/Telegram/SourceFiles/window.cpp +++ b/Telegram/SourceFiles/window.cpp @@ -2209,7 +2209,7 @@ namespace { zByteArray *ba = (zByteArray*)opaque; uLong toRead = 0; if (!ba->err) { - if (ba->data.size() > ba->pos) { + if (ba->data.size() > int(ba->pos)) { toRead = qMin(size, uLong(ba->data.size() - ba->pos)); memcpy(buf, ba->data.constData() + ba->pos, toRead); ba->pos += toRead; @@ -2223,7 +2223,7 @@ namespace { uLong zByteArrayWriteFile(voidpf opaque, voidpf stream, const void* buf, uLong size) { zByteArray *ba = (zByteArray*)opaque; - if (ba->data.size() < ba->pos + size) { + if (ba->data.size() < int(ba->pos + size)) { ba->data.resize(ba->pos + size); } memcpy(ba->data.data() + ba->pos, buf, size); @@ -2257,7 +2257,7 @@ namespace { case ZLIB_FILEFUNC_SEEK_CUR: ba->pos += offset; break; case ZLIB_FILEFUNC_SEEK_END: ba->pos = ba->data.size() + offset; break; } - if (ba->pos > ba->data.size()) { + if (int(ba->pos) > ba->data.size()) { ba->err = -1; } } @@ -2303,6 +2303,7 @@ void LastCrashedWindow::onCheckingFinished() { reportPart.setBody(Global::LastCrashDump()); multipart->append(reportPart); +#ifdef Q_OS_WIN QFileInfo dmpFile(_minidumpFull); if (dmpFile.exists() && dmpFile.size() > 0 && dmpFile.size() < 20 * 1024 * 1024 && QRegularExpression(qsl("^Telegram\\-[\\d\\.\\-]{1,64}\\.dmp$")).match(dmpFile.fileName()).hasMatch()) { @@ -2354,6 +2355,7 @@ void LastCrashedWindow::onCheckingFinished() { } } } +#endif _sendReply = _sendManager.post(QNetworkRequest(qsl("https://tdesktop.com/crash.php?act=report")), multipart); multipart->setParent(_sendReply);