procxx
/
kepka
mirror of https://github.com/procxx/kepka.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Changed all .. to ... in phrases

This commit is contained in:
John Preston 2016-03-24 18:07:13 +03:00
parent a267d9d43b
commit 605f5305e4
20 changed files with 94 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -80,7 +80,7 @@ The source code is published under GPLv3 with OpenSSL exception, the license is
* ### MetaLang * ### MetaLang
Creates from languagepack file `Resources/lang.txt` language constants code and language file parse code: Creates from languagepack file `Resources/lang.strings` language constants code and language file parse code:
* GeneratedFiles/lang.h * GeneratedFiles/lang.h
* GeneratedFiles/lang.cpp * GeneratedFiles/lang.cpp

4
Telegram/SourceFiles/_other/genlang.cpp
View File

@ -391,7 +391,7 @@ bool genLang(const QString &lang_in, const QString &lang_out) {
th.setCodec("ISO 8859-1"); th.setCodec("ISO 8859-1");
th << "\ th << "\
/*\n\ /*\n\
Created from \'/Resources/lang.txt\' by \'/MetaLang\' project\n\ Created from \'/Resources/lang.strings\' by \'/MetaLang\' project\n\
\n\ \n\
WARNING! All changes made in this file will be lost!\n\ WARNING! All changes made in this file will be lost!\n\
\n\ \n\
@ -475,7 +475,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org\n\
tcpp << "\ tcpp << "\
/*\n\ /*\n\
Created from \'/Resources/lang.txt\' by \'/MetaLang\' project\n\ Created from \'/Resources/lang.strings\' by \'/MetaLang\' project\n\
\n\ \n\
WARNING! All changes made in this file will be lost!\n\ WARNING! All changes made in this file will be lost!\n\
\n\ \n\

32
Telegram/SourceFiles/application.cpp
View File

@ -120,16 +120,16 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv)
#endif #endif
if (cManyInstance()) { if (cManyInstance()) {
LOG(("Many instance allowed, starting..")); LOG(("Many instance allowed, starting..."));
singleInstanceChecked(); singleInstanceChecked();
} else { } else {
LOG(("Connecting local socket to %1..").arg(_localServerName)); LOG(("Connecting local socket to %1...").arg(_localServerName));
_localSocket.connectToServer(_localServerName); _localSocket.connectToServer(_localServerName);
} }
} }
void Application::socketConnected() { void Application::socketConnected() {
LOG(("Socket connected, this is not the first application instance, sending show command..")); LOG(("Socket connected, this is not the first application instance, sending show command..."));
_secondInstance = true; _secondInstance = true;
QString commands; QString commands;
@ -154,7 +154,7 @@ void Application::socketWritten(qint64/* bytes*/) {
if (_localSocket.bytesToWrite()) { if (_localSocket.bytesToWrite()) {
return; return;
} }
LOG(("Show command written, waiting response..")); LOG(("Show command written, waiting response..."));
} }
void Application::socketReading() { void Application::socketReading() {
@ -166,7 +166,7 @@ void Application::socketReading() {
if (QRegularExpression("RES:(\\d+);").match(_localSocketReadData).hasMatch()) { if (QRegularExpression("RES:(\\d+);").match(_localSocketReadData).hasMatch()) {
uint64 pid = _localSocketReadData.mid(4, _localSocketReadData.length() - 5).toULongLong(); uint64 pid = _localSocketReadData.mid(4, _localSocketReadData.length() - 5).toULongLong();
psActivateProcess(pid); psActivateProcess(pid);
LOG(("Show command response received, pid = %1, activating and quitting..").arg(pid)); LOG(("Show command response received, pid = %1, activating and quitting...").arg(pid));
return App::quit(); return App::quit();
} }
} }
@ -175,14 +175,14 @@ void Application::socketError(QLocalSocket::LocalSocketError e) {
if (App::quitting()) return; if (App::quitting()) return;
if (_secondInstance) { if (_secondInstance) {
LOG(("Could not write show command, error %1, quitting..").arg(e)); LOG(("Could not write show command, error %1, quitting...").arg(e));
return App::quit(); return App::quit();
} }
if (e == QLocalSocket::ServerNotFoundError) { if (e == QLocalSocket::ServerNotFoundError) {
LOG(("This is the only instance of Telegram, starting server and app..")); LOG(("This is the only instance of Telegram, starting server and app..."));
} else { } else {
LOG(("Socket connect error %1, starting server and app..").arg(e)); LOG(("Socket connect error %1, starting server and app...").arg(e));
} }
_localSocket.close(); _localSocket.close();
@ -196,7 +196,7 @@ void Application::socketError(QLocalSocket::LocalSocketError e) {
#ifndef TDESKTOP_DISABLE_AUTOUPDATE #ifndef TDESKTOP_DISABLE_AUTOUPDATE
if (!cNoStartUpdate() && checkReadyUpdate()) { if (!cNoStartUpdate() && checkReadyUpdate()) {
cSetRestartingUpdate(true); cSetRestartingUpdate(true);
DEBUG_LOG(("Application Info: installing update instead of starting app..")); DEBUG_LOG(("Application Info: installing update instead of starting app..."));
return App::quit(); return App::quit();
} }
#endif #endif
@ -235,7 +235,7 @@ void Application::singleInstanceChecked() {
void Application::socketDisconnected() { void Application::socketDisconnected() {
if (_secondInstance) { if (_secondInstance) {
DEBUG_LOG(("Application Error: socket disconnected before command response received, quitting..")); DEBUG_LOG(("Application Error: socket disconnected before command response received, quitting..."));
return App::quit(); return App::quit();
} }
} }
@ -704,7 +704,7 @@ AppClass::AppClass() : QObject()
anim::startManager(); anim::startManager();
historyInit(); historyInit();
DEBUG_LOG(("Application Info: inited..")); DEBUG_LOG(("Application Info: inited..."));
application()->installNativeEventFilter(psNativeEventFilter()); application()->installNativeEventFilter(psNativeEventFilter());
@ -714,7 +714,7 @@ AppClass::AppClass() : QObject()
connect(&killDownloadSessionsTimer, SIGNAL(timeout()), this, SLOT(killDownloadSessions())); connect(&killDownloadSessionsTimer, SIGNAL(timeout()), this, SLOT(killDownloadSessions()));
DEBUG_LOG(("Application Info: starting app..")); DEBUG_LOG(("Application Info: starting app..."));
QMimeDatabase().mimeTypeForName(qsl("text/plain")); // create mime database QMimeDatabase().mimeTypeForName(qsl("text/plain")); // create mime database
@ -724,7 +724,7 @@ AppClass::AppClass() : QObject()
Sandbox::connect(SIGNAL(applicationStateChanged(Qt::ApplicationState)), this, SLOT(onAppStateChanged(Qt::ApplicationState))); Sandbox::connect(SIGNAL(applicationStateChanged(Qt::ApplicationState)), this, SLOT(onAppStateChanged(Qt::ApplicationState)));
DEBUG_LOG(("Application Info: window created..")); DEBUG_LOG(("Application Info: window created..."));
Shortcuts::start(); Shortcuts::start();
@ -734,16 +734,16 @@ AppClass::AppClass() : QObject()
Local::ReadMapState state = Local::readMap(QByteArray()); Local::ReadMapState state = Local::readMap(QByteArray());
if (state == Local::ReadMapPassNeeded) { if (state == Local::ReadMapPassNeeded) {
cSetHasPasscode(true); cSetHasPasscode(true);
DEBUG_LOG(("Application Info: passcode nneded..")); DEBUG_LOG(("Application Info: passcode needed..."));
} else { } else {
DEBUG_LOG(("Application Info: local map read..")); DEBUG_LOG(("Application Info: local map read..."));
MTP::start(); MTP::start();
} }
MTP::setStateChangedHandler(mtpStateChanged); MTP::setStateChangedHandler(mtpStateChanged);
MTP::setSessionResetHandler(mtpSessionReset); MTP::setSessionResetHandler(mtpSessionReset);
DEBUG_LOG(("Application Info: MTP started..")); DEBUG_LOG(("Application Info: MTP started..."));
DEBUG_LOG(("Application Info: showing.")); DEBUG_LOG(("Application Info: showing."));
if (state == Local::ReadMapPassNeeded) { if (state == Local::ReadMapPassNeeded) {

2
Telegram/SourceFiles/autoupdater.cpp
View File

@ -569,7 +569,7 @@ bool checkReadyUpdate() {
} }
#elif defined Q_OS_MAC #elif defined Q_OS_MAC
QDir().mkpath(QFileInfo(curUpdater).absolutePath()); QDir().mkpath(QFileInfo(curUpdater).absolutePath());
DEBUG_LOG(("Update Info: moving %1 to %2..").arg(updater.absoluteFilePath()).arg(curUpdater)); DEBUG_LOG(("Update Info: moving %1 to %2...").arg(updater.absoluteFilePath()).arg(curUpdater));
if (!objc_moveFile(updater.absoluteFilePath(), curUpdater)) { if (!objc_moveFile(updater.absoluteFilePath(), curUpdater)) {
UpdateChecker::clearAll(); UpdateChecker::clearAll();
return false; return false;

2
Telegram/SourceFiles/boxes/languagebox.cpp
View File

@ -88,7 +88,7 @@ void LanguageBox::mousePressEvent(QMouseEvent *e) {
return; return;
} else if (!loader.warnings().isEmpty()) { } else if (!loader.warnings().isEmpty()) {
QString warn = loader.warnings(); QString warn = loader.warnings();
if (warn.size() > 256) warn = warn.mid(0, 254) + qsl(".."); if (warn.size() > 256) warn = warn.mid(0, 253) + qsl("...");
Ui::showLayer(new InformBox(qsl("Lang \"") + LanguageCodes[i] + qsl("\" warnings :(\n\nWarnings: ") + warn)); Ui::showLayer(new InformBox(qsl("Lang \"") + LanguageCodes[i] + qsl("\" warnings :(\n\nWarnings: ") + warn));
return; return;
} }

2
Telegram/SourceFiles/gui/text.cpp
View File

@ -3471,7 +3471,7 @@ TextBlock::TextBlock(const style::font &font, const QString &str, QFixed minResi
if (length) { if (length) {
style::font blockFont = font; style::font blockFont = font;
if (!flags && lnkIndex) { if (!flags && lnkIndex) {
// should use textStyle lnkFlags somehow.. not supported // should use textStyle lnkFlags somehow... not supported
} }
if ((flags & TextBlockFPre) || (flags & TextBlockFCode)) { if ((flags & TextBlockFPre) || (flags & TextBlockFCode)) {

14
Telegram/SourceFiles/history.cpp
View File

@ -1819,7 +1819,7 @@ void History::addOlderSlice(const QVector<MTPMessage> &slice, const QVector<MTPM
// some checks if there was some message history already // some checks if there was some message history already
if (block && blocks.size() > 1) { if (block && blocks.size() > 1) {
HistoryItem *last = block->items.back(); // .. item, item, item, last ], [ first, item, item .. HistoryItem *last = block->items.back(); // ... item, item, item, last ], [ first, item, item ...
HistoryItem *first = blocks.at(1)->items.front(); HistoryItem *first = blocks.at(1)->items.front();
// we've added a new front block, so previous item for // we've added a new front block, so previous item for
@ -6946,7 +6946,7 @@ QString HistoryMessage::notificationHeader() const {
QString HistoryMessage::notificationText() const { QString HistoryMessage::notificationText() const {
QString msg(inDialogsText()); QString msg(inDialogsText());
if (msg.size() > 0xFF) msg = msg.mid(0, 0xFF) + qsl(".."); if (msg.size() > 0xFF) msg = msg.mid(0, 0xFF) + qsl("...");
return msg; return msg;
} }
@ -7513,7 +7513,7 @@ bool HistoryServiceMessage::updatePinnedText(const QString *pfrom, QString *ptex
} }
} }
if (!limit && cutat + 5 < size) { if (!limit && cutat + 5 < size) {
original = original.mid(0, cutat) + qstr(".."); original = original.mid(0, cutat) + qstr("...");
} }
text = lng_action_pinned_message(lt_from, from, lt_text, textcmdLink(2, original)); text = lng_action_pinned_message(lt_from, from, lt_text, textcmdLink(2, original));
} else { } else {
@ -7796,7 +7796,7 @@ void HistoryServiceMessage::drawInDialog(Painter &p, const QRect &r, bool act, c
QString HistoryServiceMessage::notificationText() const { QString HistoryServiceMessage::notificationText() const {
QString msg = _text.original(); QString msg = _text.original();
if (msg.size() > 0xFF) msg = msg.mid(0, 0xFF) + qsl(".."); if (msg.size() > 0xFF) msg = msg.mid(0, 0xFF) + qsl("...");
return msg; return msg;
} }
@ -7817,7 +7817,7 @@ HistoryServiceMessage::~HistoryServiceMessage() {
} }
HistoryGroup::HistoryGroup(History *history, const MTPDmessageGroup &group, const QDateTime &date) HistoryGroup::HistoryGroup(History *history, const MTPDmessageGroup &group, const QDateTime &date)
: HistoryServiceMessage(history, clientMsgId(), date, lng_channel_comments_count(lt_count, group.vcount.v)/* + qsl(" (%1 .. %2)").arg(group.vmin_id.v).arg(group.vmax_id.v)*/) : HistoryServiceMessage(history, clientMsgId(), date, lng_channel_comments_count(lt_count, group.vcount.v)/* + qsl(" (%1 ... %2)").arg(group.vmin_id.v).arg(group.vmax_id.v)*/)
, _minId(group.vmin_id.v) , _minId(group.vmin_id.v)
, _maxId(group.vmax_id.v) , _maxId(group.vmax_id.v)
, _count(group.vcount.v) , _count(group.vcount.v)
@ -7825,7 +7825,7 @@ HistoryGroup::HistoryGroup(History *history, const MTPDmessageGroup &group, cons
} }
HistoryGroup::HistoryGroup(History *history, HistoryItem *newItem, const QDateTime &date) HistoryGroup::HistoryGroup(History *history, HistoryItem *newItem, const QDateTime &date)
: HistoryServiceMessage(history, clientMsgId(), date, lng_channel_comments_count(lt_count, 1)/* + qsl(" (%1 .. %2)").arg(newItem->id - 1).arg(newItem->id + 1)*/) : HistoryServiceMessage(history, clientMsgId(), date, lng_channel_comments_count(lt_count, 1)/* + qsl(" (%1 ... %2)").arg(newItem->id - 1).arg(newItem->id + 1)*/)
, _minId(newItem->id - 1) , _minId(newItem->id - 1)
, _maxId(newItem->id + 1) , _maxId(newItem->id + 1)
, _count(1) , _count(1)
@ -7891,7 +7891,7 @@ bool HistoryGroup::decrementCount() {
} }
void HistoryGroup::updateText() { void HistoryGroup::updateText() {
setServiceText(lng_channel_comments_count(lt_count, _count)/* + qsl(" (%1 .. %2)").arg(_minId).arg(_maxId)*/); setServiceText(lng_channel_comments_count(lt_count, _count)/* + qsl(" (%1 ... %2)").arg(_minId).arg(_maxId)*/);
} }
HistoryCollapse::HistoryCollapse(History *history, MsgId wasMinId, const QDateTime &date) HistoryCollapse::HistoryCollapse(History *history, MsgId wasMinId, const QDateTime &date)

26
Telegram/SourceFiles/localstorage.cpp
View File

@ -1370,7 +1370,7 @@ namespace {
bool result = false; bool result = false;
QFile file(cWorkingDir() + qsl("tdata/config")); QFile file(cWorkingDir() + qsl("tdata/config"));
if (file.open(QIODevice::ReadOnly)) { if (file.open(QIODevice::ReadOnly)) {
LOG(("App Info: reading old config..")); LOG(("App Info: reading old config..."));
QDataStream stream(&file); QDataStream stream(&file);
stream.setVersion(QDataStream::Qt_5_1); stream.setVersion(QDataStream::Qt_5_1);
@ -1450,7 +1450,7 @@ namespace {
QBuffer decryptedStream(&decrypted); QBuffer decryptedStream(&decrypted);
decryptedStream.open(QIODevice::ReadOnly); decryptedStream.open(QIODevice::ReadOnly);
decryptedStream.seek(4); // skip size decryptedStream.seek(4); // skip size
LOG(("App Info: reading encrypted old user config..")); LOG(("App Info: reading encrypted old user config..."));
_readOldUserSettingsFields(&decryptedStream, version); _readOldUserSettingsFields(&decryptedStream, version);
} else if (!_readSetting(blockId, stream, version)) { } else if (!_readSetting(blockId, stream, version)) {
@ -1463,7 +1463,7 @@ namespace {
bool result = false; bool result = false;
QFile file(cWorkingDir() + cDataFile() + (cTestMode() ? qsl("_test") : QString()) + qsl("_config")); QFile file(cWorkingDir() + cDataFile() + (cTestMode() ? qsl("_test") : QString()) + qsl("_config"));
if (file.open(QIODevice::ReadOnly)) { if (file.open(QIODevice::ReadOnly)) {
LOG(("App Info: reading old user config..")); LOG(("App Info: reading old user config..."));
qint32 version = 0; qint32 version = 0;
MTP::DcOptions dcOpts; MTP::DcOptions dcOpts;
@ -1537,7 +1537,7 @@ namespace {
QBuffer decryptedStream(&decrypted); QBuffer decryptedStream(&decrypted);
decryptedStream.open(QIODevice::ReadOnly); decryptedStream.open(QIODevice::ReadOnly);
decryptedStream.seek(4); // skip size decryptedStream.seek(4); // skip size
LOG(("App Info: reading encrypted old keys..")); LOG(("App Info: reading encrypted old keys..."));
_readOldMtpDataFields(&decryptedStream, version); _readOldMtpDataFields(&decryptedStream, version);
} else if (!_readSetting(blockId, stream, version)) { } else if (!_readSetting(blockId, stream, version)) {
@ -1550,7 +1550,7 @@ namespace {
bool result = false; bool result = false;
QFile file(cWorkingDir() + cDataFile() + (cTestMode() ? qsl("_test") : QString())); QFile file(cWorkingDir() + cDataFile() + (cTestMode() ? qsl("_test") : QString()));
if (file.open(QIODevice::ReadOnly)) { if (file.open(QIODevice::ReadOnly)) {
LOG(("App Info: reading old keys..")); LOG(("App Info: reading old keys..."));
qint32 version = 0; qint32 version = 0;
MTP::DcOptions dcOpts; MTP::DcOptions dcOpts;
@ -1647,7 +1647,7 @@ namespace {
return _writeUserSettings(); return _writeUserSettings();
} }
LOG(("App Info: reading encrypted user settings..")); LOG(("App Info: reading encrypted user settings..."));
while (!userSettings.stream.atEnd()) { while (!userSettings.stream.atEnd()) {
quint32 blockId; quint32 blockId;
userSettings.stream >> blockId; userSettings.stream >> blockId;
@ -1693,7 +1693,7 @@ namespace {
return; return;
} }
LOG(("App Info: reading encrypted mtp data..")); LOG(("App Info: reading encrypted mtp data..."));
while (!mtp.stream.atEnd()) { while (!mtp.stream.atEnd()) {
quint32 blockId; quint32 blockId;
mtp.stream >> blockId; mtp.stream >> blockId;
@ -1719,7 +1719,7 @@ namespace {
if (!readFile(mapData, qsl("map"))) { if (!readFile(mapData, qsl("map"))) {
return Local::ReadMapFailed; return Local::ReadMapFailed;
} }
LOG(("App Info: reading map..")); LOG(("App Info: reading map..."));
QByteArray salt, keyEncrypted, mapEncrypted; QByteArray salt, keyEncrypted, mapEncrypted;
mapData.stream >> salt >> keyEncrypted >> mapEncrypted; mapData.stream >> salt >> keyEncrypted >> mapEncrypted;
@ -1735,7 +1735,7 @@ namespace {
EncryptedDescriptor keyData, map; EncryptedDescriptor keyData, map;
if (!decryptLocal(keyData, keyEncrypted, _passKey)) { if (!decryptLocal(keyData, keyEncrypted, _passKey)) {
LOG(("App Info: could not decrypt pass-protected key from map file, maybe bad password..")); LOG(("App Info: could not decrypt pass-protected key from map file, maybe bad password..."));
return Local::ReadMapPassNeeded; return Local::ReadMapPassNeeded;
} }
uchar key[LocalEncryptKeySize] = { 0 }; uchar key[LocalEncryptKeySize] = { 0 };
@ -1752,7 +1752,7 @@ namespace {
LOG(("App Error: could not decrypt map.")); LOG(("App Error: could not decrypt map."));
return Local::ReadMapFailed; return Local::ReadMapFailed;
} }
LOG(("App Info: reading encrypted map..")); LOG(("App Info: reading encrypted map..."));
DraftsMap draftsMap, draftCursorsMap; DraftsMap draftsMap, draftCursorsMap;
DraftsNotReadMap draftsNotReadMap; DraftsNotReadMap draftsNotReadMap;
@ -2101,7 +2101,7 @@ namespace Local {
_readOldMtpData(false); // needed further in _readMtpData _readOldMtpData(false); // needed further in _readMtpData
return writeSettings(); return writeSettings();
} }
LOG(("App Info: reading settings..")); LOG(("App Info: reading settings..."));
QByteArray salt, settingsEncrypted; QByteArray salt, settingsEncrypted;
settingsData.stream >> salt >> settingsEncrypted; settingsData.stream >> salt >> settingsEncrypted;
@ -2117,7 +2117,7 @@ namespace Local {
EncryptedDescriptor settings; EncryptedDescriptor settings;
if (!decryptLocal(settings, settingsEncrypted, _settingsKey)) { if (!decryptLocal(settings, settingsEncrypted, _settingsKey)) {
LOG(("App Error: could not decrypt settings from settings file, maybe bad passcode..")); LOG(("App Error: could not decrypt settings from settings file, maybe bad passcode..."));
return writeSettings(); return writeSettings();
} }
MTP::DcOptions dcOpts; MTP::DcOptions dcOpts;
@ -2126,7 +2126,7 @@ namespace Local {
dcOpts = Global::DcOptions(); dcOpts = Global::DcOptions();
} }
_dcOpts = &dcOpts; _dcOpts = &dcOpts;
LOG(("App Info: reading encrypted settings..")); LOG(("App Info: reading encrypted settings..."));
while (!settings.stream.atEnd()) { while (!settings.stream.atEnd()) {
quint32 blockId; quint32 blockId;
settings.stream >> blockId; settings.stream >> blockId;

4
Telegram/SourceFiles/main.cpp
View File

@ -62,12 +62,12 @@ int main(int argc, char *argv[]) {
#ifndef TDESKTOP_DISABLE_AUTOUPDATE #ifndef TDESKTOP_DISABLE_AUTOUPDATE
if (cRestartingUpdate()) { if (cRestartingUpdate()) {
DEBUG_LOG(("Application Info: executing updater to install update..")); DEBUG_LOG(("Application Info: executing updater to install update..."));
psExecUpdater(); psExecUpdater();
} else } else
#endif #endif
if (cRestarting()) { if (cRestarting()) {
DEBUG_LOG(("Application Info: executing Telegram, because of restart..")); DEBUG_LOG(("Application Info: executing Telegram, because of restart..."));
psExecTelegram(); psExecTelegram();
} }

4
Telegram/SourceFiles/mtproto/auth_key.h
View File

@ -54,7 +54,7 @@ public:
} }
void prepareAES(const MTPint128 &msgKey, MTPint256 &aesKey, MTPint256 &aesIV, bool send = true) const { void prepareAES(const MTPint128 &msgKey, MTPint256 &aesKey, MTPint256 &aesIV, bool send = true) const {
if (!_isset) throw mtpErrorKeyNotReady(QString("prepareAES(.., %1)").arg(Logs::b(send))); if (!_isset) throw mtpErrorKeyNotReady(QString("prepareAES(..., %1)").arg(Logs::b(send)));
uint32 x = send ? 0 : 8; uint32 x = send ? 0 : 8;
@ -90,7 +90,7 @@ public:
} }
void write(QDataStream &to) const { void write(QDataStream &to) const {
if (!_isset) throw mtpErrorKeyNotReady("write(..)"); if (!_isset) throw mtpErrorKeyNotReady("write(...)");
to.writeRawData(_key, 256); to.writeRawData(_key, 256);
} }

56
Telegram/SourceFiles/mtproto/connection.cpp
View File

@ -447,7 +447,7 @@ ConnectionPrivate::ConnectionPrivate(QThread *thread, Connection *owner, Session
return; return;
} }
dc = options.cbegin().value().id; dc = options.cbegin().value().id;
DEBUG_LOG(("MTP Info: searching for any DC, %1 selected..").arg(dc)); DEBUG_LOG(("MTP Info: searching for any DC, %1 selected...").arg(dc));
} }
connect(thread, SIGNAL(started()), this, SLOT(socketStart())); connect(thread, SIGNAL(started()), this, SLOT(socketStart()));
@ -1154,8 +1154,8 @@ void ConnectionPrivate::socketStart(bool afterConfig) {
_pingId = _pingMsgId = _pingIdToSend = _pingSendAt = 0; _pingId = _pingMsgId = _pingIdToSend = _pingSendAt = 0;
_pingSender.stop(); _pingSender.stop();
if (!noIPv4) DEBUG_LOG(("MTP Info: creating IPv4 connection to %1:%2 (tcp) and %3:%4 (http)..").arg(ip[IPv4address][TcpProtocol].c_str()).arg(port[IPv4address][TcpProtocol]).arg(ip[IPv4address][HttpProtocol].c_str()).arg(port[IPv4address][HttpProtocol])); if (!noIPv4) DEBUG_LOG(("MTP Info: creating IPv4 connection to %1:%2 (tcp) and %3:%4 (http)...").arg(ip[IPv4address][TcpProtocol].c_str()).arg(port[IPv4address][TcpProtocol]).arg(ip[IPv4address][HttpProtocol].c_str()).arg(port[IPv4address][HttpProtocol]));
if (!noIPv6) DEBUG_LOG(("MTP Info: creating IPv6 connection to [%1]:%2 (tcp) and [%3]:%4 (http)..").arg(ip[IPv6address][TcpProtocol].c_str()).arg(port[IPv6address][TcpProtocol]).arg(ip[IPv4address][HttpProtocol].c_str()).arg(port[IPv4address][HttpProtocol])); if (!noIPv6) DEBUG_LOG(("MTP Info: creating IPv6 connection to [%1]:%2 (tcp) and [%3]:%4 (http)...").arg(ip[IPv6address][TcpProtocol].c_str()).arg(port[IPv6address][TcpProtocol]).arg(ip[IPv4address][HttpProtocol].c_str()).arg(port[IPv4address][HttpProtocol]));
_waitForConnectedTimer.start(_waitForConnected); _waitForConnectedTimer.start(_waitForConnected);
if (auto conn = _conn4) { if (auto conn = _conn4) {
@ -1188,7 +1188,7 @@ void ConnectionPrivate::restart(bool mayBeBadKey) {
clearMessages(); clearMessages();
keyId = AuthKey::RecreateKeyId; keyId = AuthKey::RecreateKeyId;
// retryTimeout = 1; // no ddos please // retryTimeout = 1; // no ddos please
LOG(("MTP Info: key may be bad and was not checked - but won't be destroyed, no log outs because of bad server right now..")); LOG(("MTP Info: key may be bad and was not checked - but won't be destroyed, no log outs because of bad server right now..."));
} }
} else { } else {
sessionData->setCheckedKey(false); sessionData->setCheckedKey(false);
@ -1254,7 +1254,7 @@ void ConnectionPrivate::onOldConnection() {
void ConnectionPrivate::onPingSender() { void ConnectionPrivate::onPingSender() {
if (_pingId) { if (_pingId) {
if (_pingSendAt + (MTPPingSendAfter - MTPPingSendAfterAuto - 1) * 1000ULL < getms(true)) { if (_pingSendAt + (MTPPingSendAfter - MTPPingSendAfterAuto - 1) * 1000ULL < getms(true)) {
LOG(("Could not send ping for MTPPingSendAfter seconds, restarting..")); LOG(("Could not send ping for MTPPingSendAfter seconds, restarting..."));
return restart(); return restart();
} else { } else {
_pingSender.start(_pingSendAt + (MTPPingSendAfter - MTPPingSendAfterAuto) * 1000ULL - getms(true)); _pingSender.start(_pingSendAt + (MTPPingSendAfter - MTPPingSendAfterAuto) * 1000ULL - getms(true));
@ -1440,7 +1440,7 @@ void ConnectionPrivate::handleReceived() {
bool wasConnected = (getState() == ConnectedState); bool wasConnected = (getState() == ConnectedState);
if (serverSalt != mySalt) { if (serverSalt != mySalt) {
if (!badTime) { if (!badTime) {
DEBUG_LOG(("MTP Info: other salt received.. received: %1, my salt: %2, updating..").arg(serverSalt).arg(mySalt)); DEBUG_LOG(("MTP Info: other salt received... received: %1, my salt: %2, updating...").arg(serverSalt).arg(mySalt));
sessionData->setSalt(serverSalt); sessionData->setSalt(serverSalt);
if (setState(ConnectedState, ConnectingState)) { // only connected if (setState(ConnectedState, ConnectingState)) { // only connected
if (restarted) { if (restarted) {
@ -1449,7 +1449,7 @@ void ConnectionPrivate::handleReceived() {
} }
} }
} else { } else {
DEBUG_LOG(("MTP Info: other salt received.. received: %1, my salt: %2").arg(serverSalt).arg(mySalt)); DEBUG_LOG(("MTP Info: other salt received... received: %1, my salt: %2").arg(serverSalt).arg(mySalt));
} }
} else { } else {
serverSalt = 0; // dont pass to handle method, so not to lock in setSalt() serverSalt = 0; // dont pass to handle method, so not to lock in setSalt()
@ -1659,7 +1659,7 @@ int32 ConnectionPrivate::handleOneReceived(const mtpPrime *from, const mtpPrime
if (serverSalt) sessionData->setSalt(serverSalt); if (serverSalt) sessionData->setSalt(serverSalt);
unixtimeSet(serverTime, true); unixtimeSet(serverTime, true);
DEBUG_LOG(("Message Info: unixtime updated, now %1, resending in container..").arg(serverTime)); DEBUG_LOG(("Message Info: unixtime updated, now %1, resending in container...").arg(serverTime));
resend(resendId, 0, true); resend(resendId, 0, true);
} else { // must create new session, because msg_id and msg_seqno are inconsistent } else { // must create new session, because msg_id and msg_seqno are inconsistent
@ -1710,13 +1710,13 @@ int32 ConnectionPrivate::handleOneReceived(const mtpPrime *from, const mtpPrime
badTime = false; badTime = false;
DEBUG_LOG(("Message Info: unixtime updated, now %1, server_salt updated, now %2, resending..").arg(serverTime).arg(serverSalt)); DEBUG_LOG(("Message Info: unixtime updated, now %1, server_salt updated, now %2, resending...").arg(serverTime).arg(serverSalt));
resend(resendId); resend(resendId);
} return 1; } return 1;
case mtpc_msgs_state_req: { case mtpc_msgs_state_req: {
if (badTime) { if (badTime) {
DEBUG_LOG(("Message Info: skipping with bad time..")); DEBUG_LOG(("Message Info: skipping with bad time..."));
return 0; return 0;
} }
MTPMsgsStateReq msg(from, end); MTPMsgsStateReq msg(from, end);
@ -1818,7 +1818,7 @@ int32 ConnectionPrivate::handleOneReceived(const mtpPrime *from, const mtpPrime
case mtpc_msgs_all_info: { case mtpc_msgs_all_info: {
if (badTime) { if (badTime) {
DEBUG_LOG(("Message Info: skipping with bad time..")); DEBUG_LOG(("Message Info: skipping with bad time..."));
return 0; return 0;
} }
@ -1862,14 +1862,14 @@ int32 ConnectionPrivate::handleOneReceived(const mtpPrime *from, const mtpPrime
if (received) { if (received) {
ackRequestData.push_back(resMsgId); ackRequestData.push_back(resMsgId);
} else { } else {
DEBUG_LOG(("Message Info: answer message %1 was not received, requesting..").arg(resMsgId.v)); DEBUG_LOG(("Message Info: answer message %1 was not received, requesting...").arg(resMsgId.v));
resendRequestData.push_back(resMsgId); resendRequestData.push_back(resMsgId);
} }
} return 1; } return 1;
case mtpc_msg_new_detailed_info: { case mtpc_msg_new_detailed_info: {
if (badTime) { if (badTime) {
DEBUG_LOG(("Message Info: skipping msg_new_detailed_info with bad time..")); DEBUG_LOG(("Message Info: skipping msg_new_detailed_info with bad time..."));
return 0; return 0;
} }
MTPMsgDetailedInfo msg(from, end); MTPMsgDetailedInfo msg(from, end);
@ -1887,7 +1887,7 @@ int32 ConnectionPrivate::handleOneReceived(const mtpPrime *from, const mtpPrime
if (received) { if (received) {
ackRequestData.push_back(resMsgId); ackRequestData.push_back(resMsgId);
} else { } else {
DEBUG_LOG(("Message Info: answer message %1 was not received, requesting..").arg(resMsgId.v)); DEBUG_LOG(("Message Info: answer message %1 was not received, requesting...").arg(resMsgId.v));
resendRequestData.push_back(resMsgId); resendRequestData.push_back(resMsgId);
} }
} return 1; } return 1;
@ -1914,7 +1914,7 @@ int32 ConnectionPrivate::handleOneReceived(const mtpPrime *from, const mtpPrime
MTPlong reqMsgId(++from, end); MTPlong reqMsgId(++from, end);
mtpTypeId typeId = from[0]; mtpTypeId typeId = from[0];
DEBUG_LOG(("RPC Info: response received for %1, queueing..").arg(reqMsgId.v)); DEBUG_LOG(("RPC Info: response received for %1, queueing...").arg(reqMsgId.v));
QVector<MTPlong> ids(1, reqMsgId); QVector<MTPlong> ids(1, reqMsgId);
if (badTime) { if (badTime) {
@ -1995,7 +1995,7 @@ int32 ConnectionPrivate::handleOneReceived(const mtpPrime *from, const mtpPrime
if (badTime) return 0; if (badTime) return 0;
MTPPing msg(from, end); MTPPing msg(from, end);
DEBUG_LOG(("Message Info: ping received, ping_id: %1, sending pong..").arg(msg.vping_id.v)); DEBUG_LOG(("Message Info: ping received, ping_id: %1, sending pong...").arg(msg.vping_id.v));
emit sendPongAsync(msgId, msg.vping_id.v); emit sendPongAsync(msgId, msg.vping_id.v);
} return 1; } return 1;
@ -2012,7 +2012,7 @@ int32 ConnectionPrivate::handleOneReceived(const mtpPrime *from, const mtpPrime
if (data.vping_id.v == _pingId) { if (data.vping_id.v == _pingId) {
_pingId = 0; _pingId = 0;
} else { } else {
DEBUG_LOG(("Message Info: just pong..")); DEBUG_LOG(("Message Info: just pong..."));
} }
QVector<MTPlong> ids(1, data.vmsg_id); QVector<MTPlong> ids(1, data.vmsg_id);
@ -2154,7 +2154,7 @@ void ConnectionPrivate::requestsAcked(const QVector<MTPlong> &ids, bool byRespon
} }
} }
} else { } else {
DEBUG_LOG(("Message Info: msgId %1 was not found in recent sent, while acking requests, searching in resend..").arg(msgId)); DEBUG_LOG(("Message Info: msgId %1 was not found in recent sent, while acking requests, searching in resend...").arg(msgId));
QWriteLocker locker3(sessionData->toResendMutex()); QWriteLocker locker3(sessionData->toResendMutex());
mtpRequestIdsMap &toResend(sessionData->toResendMap()); mtpRequestIdsMap &toResend(sessionData->toResendMap());
mtpRequestIdsMap::iterator reqIt = toResend.find(msgId); mtpRequestIdsMap::iterator reqIt = toResend.find(msgId);
@ -2228,7 +2228,7 @@ void ConnectionPrivate::handleMsgsStates(const QVector<MTPlong> &ids, const stri
const mtpRequestMap &haveSent(sessionData->haveSentMap()); const mtpRequestMap &haveSent(sessionData->haveSentMap());
mtpRequestMap::const_iterator haveSentEnd = haveSent.cend(); mtpRequestMap::const_iterator haveSentEnd = haveSent.cend();
if (haveSent.find(requestMsgId) == haveSentEnd) { if (haveSent.find(requestMsgId) == haveSentEnd) {
DEBUG_LOG(("Message Info: state was received for msgId %1, but request is not found, looking in resent requests..").arg(requestMsgId)); DEBUG_LOG(("Message Info: state was received for msgId %1, but request is not found, looking in resent requests...").arg(requestMsgId));
QWriteLocker locker2(sessionData->toResendMutex()); QWriteLocker locker2(sessionData->toResendMutex());
mtpRequestIdsMap &toResend(sessionData->toResendMap()); mtpRequestIdsMap &toResend(sessionData->toResendMap());
mtpRequestIdsMap::iterator reqIt = toResend.find(requestMsgId); mtpRequestIdsMap::iterator reqIt = toResend.find(requestMsgId);
@ -2385,7 +2385,7 @@ void ConnectionPrivate::updateAuthKey() {
connect(_conn, SIGNAL(receivedData()), this, SLOT(pqAnswered())); connect(_conn, SIGNAL(receivedData()), this, SLOT(pqAnswered()));
DEBUG_LOG(("AuthKey Info: sending Req_pq..")); DEBUG_LOG(("AuthKey Info: sending Req_pq..."));
lockFinished.unlock(); lockFinished.unlock();
sendRequestNotSecure(req_pq); sendRequestNotSecure(req_pq);
} }
@ -2398,7 +2398,7 @@ void ConnectionPrivate::clearMessages() {
void ConnectionPrivate::pqAnswered() { void ConnectionPrivate::pqAnswered() {
disconnect(_conn, SIGNAL(receivedData()), this, SLOT(pqAnswered())); disconnect(_conn, SIGNAL(receivedData()), this, SLOT(pqAnswered()));
DEBUG_LOG(("AuthKey Info: receiving Req_pq answer..")); DEBUG_LOG(("AuthKey Info: receiving Req_pq answer..."));
MTPReq_pq::ResponseType res_pq; MTPReq_pq::ResponseType res_pq;
if (!readResponseNotSecure(res_pq)) { if (!readResponseNotSecure(res_pq)) {
@ -2490,13 +2490,13 @@ void ConnectionPrivate::pqAnswered() {
} }
connect(_conn, SIGNAL(receivedData()), this, SLOT(dhParamsAnswered())); connect(_conn, SIGNAL(receivedData()), this, SLOT(dhParamsAnswered()));
DEBUG_LOG(("AuthKey Info: sending Req_DH_params..")); DEBUG_LOG(("AuthKey Info: sending Req_DH_params..."));
sendRequestNotSecure(req_DH_params); sendRequestNotSecure(req_DH_params);
} }
void ConnectionPrivate::dhParamsAnswered() { void ConnectionPrivate::dhParamsAnswered() {
disconnect(_conn, SIGNAL(receivedData()), this, SLOT(dhParamsAnswered())); disconnect(_conn, SIGNAL(receivedData()), this, SLOT(dhParamsAnswered()));
DEBUG_LOG(("AuthKey Info: receiving Req_DH_params answer..")); DEBUG_LOG(("AuthKey Info: receiving Req_DH_params answer..."));
MTPReq_DH_params::ResponseType res_DH_params; MTPReq_DH_params::ResponseType res_DH_params;
if (!readResponseNotSecure(res_DH_params)) { if (!readResponseNotSecure(res_DH_params)) {
@ -2672,7 +2672,7 @@ void ConnectionPrivate::dhClientParamsSend() {
connect(_conn, SIGNAL(receivedData()), this, SLOT(dhClientParamsAnswered())); connect(_conn, SIGNAL(receivedData()), this, SLOT(dhClientParamsAnswered()));
DEBUG_LOG(("AuthKey Info: sending Req_client_DH_params..")); DEBUG_LOG(("AuthKey Info: sending Req_client_DH_params..."));
sendRequestNotSecure(req_client_DH_params); sendRequestNotSecure(req_client_DH_params);
} }
@ -2681,7 +2681,7 @@ void ConnectionPrivate::dhClientParamsAnswered() {
if (!sessionData) return; if (!sessionData) return;
disconnect(_conn, SIGNAL(receivedData()), this, SLOT(dhClientParamsAnswered())); disconnect(_conn, SIGNAL(receivedData()), this, SLOT(dhClientParamsAnswered()));
DEBUG_LOG(("AuthKey Info: receiving Req_client_DH_params answer..")); DEBUG_LOG(("AuthKey Info: receiving Req_client_DH_params answer..."));
MTPSet_client_DH_params::ResponseType res_client_DH_params; MTPSet_client_DH_params::ResponseType res_client_DH_params;
if (!readResponseNotSecure(res_client_DH_params)) { if (!readResponseNotSecure(res_client_DH_params)) {
@ -2839,7 +2839,7 @@ void ConnectionPrivate::onError4(bool mayBeBadKey) {
destroyConn(); destroyConn();
_waitForConnectedTimer.stop(); _waitForConnectedTimer.stop();
MTP_LOG(dc, ("Restarting after error in IPv4 connection, maybe bad key: %1..").arg(Logs::b(mayBeBadKey))); MTP_LOG(dc, ("Restarting after error in IPv4 connection, maybe bad key: %1...").arg(Logs::b(mayBeBadKey)));
return restart(mayBeBadKey); return restart(mayBeBadKey);
} else { } else {
destroyConn(&_conn4); destroyConn(&_conn4);
@ -2853,7 +2853,7 @@ void ConnectionPrivate::onError6(bool mayBeBadKey) {
destroyConn(); destroyConn();
_waitForConnectedTimer.stop(); _waitForConnectedTimer.stop();
MTP_LOG(dc, ("Restarting after error in IPv6 connection, maybe bad key: %1..").arg(Logs::b(mayBeBadKey))); MTP_LOG(dc, ("Restarting after error in IPv6 connection, maybe bad key: %1...").arg(Logs::b(mayBeBadKey)));
return restart(mayBeBadKey); return restart(mayBeBadKey);
} else { } else {
destroyConn(&_conn6); destroyConn(&_conn6);
@ -2940,7 +2940,7 @@ bool ConnectionPrivate::sendRequest(mtpRequest &request, bool needAnyResponse, Q
ReadLockerAttempt lock(sessionData->keyMutex()); ReadLockerAttempt lock(sessionData->keyMutex());
if (!lock) { if (!lock) {
DEBUG_LOG(("MTP Info: could not lock key for read in sendBuffer(), dc %1, restarting..").arg(dc)); DEBUG_LOG(("MTP Info: could not lock key for read in sendBuffer(), dc %1, restarting...").arg(dc));
lockFinished.unlock(); lockFinished.unlock();
restart(); restart();

2
Telegram/SourceFiles/mtproto/connection_tcp.cpp
View File

@ -129,7 +129,7 @@ void AbstractTCPConnection::socketRead() {
emit error(); emit error();
return; return;
} else { } else {
TCP_LOG(("TCP Info: no bytes read, but bytes available was true..")); TCP_LOG(("TCP Info: no bytes read, but bytes available was true..."));
break; break;
} }
} while (sock.state() == QAbstractSocket::ConnectedState && sock.bytesAvailable()); } while (sock.state() == QAbstractSocket::ConnectedState && sock.bytesAvailable());

2
Telegram/SourceFiles/mtproto/core_types.cpp
View File

@ -66,7 +66,7 @@ void mtpTextSerializeCore(MTPStringLogger &to, const mtpPrime *&from, const mtpP
} else if (strUtf8.size() < 64) { } else if (strUtf8.size() < 64) {
to.add(Logs::mb(strUtf8.constData(), strUtf8.size()).str()).add(" [").add(mtpWrapNumber(strUtf8.size())).add(" BYTES]"); to.add(Logs::mb(strUtf8.constData(), strUtf8.size()).str()).add(" [").add(mtpWrapNumber(strUtf8.size())).add(" BYTES]");
} else { } else {
to.add(Logs::mb(strUtf8.constData(), 16).str()).add(".. [").add(mtpWrapNumber(strUtf8.size())).add(" BYTES]"); to.add(Logs::mb(strUtf8.constData(), 16).str()).add("... [").add(mtpWrapNumber(strUtf8.size())).add(" BYTES]");
} }
} break; } break;

4
Telegram/SourceFiles/mtproto/facade.cpp
View File

@ -388,7 +388,7 @@ void registerRequest(mtpRequestId requestId, int32 dcWithShift) {
QMutexLocker locker(&requestByDCLock); QMutexLocker locker(&requestByDCLock);
requestsByDC.insert(requestId, dcWithShift); requestsByDC.insert(requestId, dcWithShift);
} }
internal::performDelayedClear(); // need to do it somewhere.. internal::performDelayedClear(); // need to do it somewhere...
} }
void unregisterRequest(mtpRequestId requestId) { void unregisterRequest(mtpRequestId requestId) {
@ -517,7 +517,7 @@ void execCallback(mtpRequestId requestId, const mtpPrime *from, const mtpPrime *
h = i.value(); h = i.value();
parserMap.erase(i); parserMap.erase(i);
DEBUG_LOG(("RPC Info: found parser for request %1, trying to parse response..").arg(requestId)); DEBUG_LOG(("RPC Info: found parser for request %1, trying to parse response...").arg(requestId));
} }
} }
if (h.onDone || h.onFail) { if (h.onDone || h.onFail) {

2
Telegram/SourceFiles/profilewidget.cpp
View File

@ -1537,7 +1537,7 @@ void ProfileInner::onMenuDestroy(QObject *obj) {
void ProfileInner::onCopyFullName() { void ProfileInner::onCopyFullName() {
if (!_peerUser) return; if (!_peerUser) return;
QApplication::clipboard()->setText(lng_full_name(lt_first_name, _peerUser->firstName, lt_last_name, _peerUser->lastName)); QApplication::clipboard()->setText(lng_full_name(lt_first_name, _peerUser->firstName, lt_last_name, _peerUser->lastName).trimmed());
} }
void ProfileInner::onCopyPhone() { void ProfileInner::onCopyPhone() {

4
Telegram/SourceFiles/pspecific_linux.cpp
View File

@ -347,7 +347,7 @@ namespace {
} }
bool loadLibrary(QLibrary &lib, const char *name, int version) { bool loadLibrary(QLibrary &lib, const char *name, int version) {
DEBUG_LOG(("Loading '%1' with version %2..").arg(QLatin1String(name)).arg(version)); DEBUG_LOG(("Loading '%1' with version %2...").arg(QLatin1String(name)).arg(version));
lib.setFileNameAndVersion(QLatin1String(name), version); lib.setFileNameAndVersion(QLatin1String(name), version);
if (lib.load()) { if (lib.load()) {
DEBUG_LOG(("Loaded '%1' with version %2!").arg(QLatin1String(name)).arg(version)); DEBUG_LOG(("Loaded '%1' with version %2!").arg(QLatin1String(name)).arg(version));
@ -443,7 +443,7 @@ namespace {
} }
if (!useGtkBase && lib_gtk.isLoaded()) { if (!useGtkBase && lib_gtk.isLoaded()) {
LOG(("Could not load appindicator, trying to load gtk..")); LOG(("Could not load appindicator, trying to load gtk..."));
setupGtkBase(lib_gtk); setupGtkBase(lib_gtk);
} }
if (!useGtkBase) { if (!useGtkBase) {

8
Telegram/SourceFiles/pspecific_win.cpp
View File

@ -2197,7 +2197,7 @@ namespace {
} }
bool _psOpenRegKey(LPCWSTR key, PHKEY rkey) { bool _psOpenRegKey(LPCWSTR key, PHKEY rkey) {
DEBUG_LOG(("App Info: opening reg key %1..").arg(QString::fromStdWString(key))); DEBUG_LOG(("App Info: opening reg key %1...").arg(QString::fromStdWString(key)));
LSTATUS status = RegOpenKeyEx(HKEY_CURRENT_USER, key, 0, KEY_QUERY_VALUE | KEY_WRITE, rkey); LSTATUS status = RegOpenKeyEx(HKEY_CURRENT_USER, key, 0, KEY_QUERY_VALUE | KEY_WRITE, rkey);
if (status != ERROR_SUCCESS) { if (status != ERROR_SUCCESS) {
if (status == ERROR_FILE_NOT_FOUND) { if (status == ERROR_FILE_NOT_FOUND) {
@ -2236,7 +2236,7 @@ namespace {
void RegisterCustomScheme() { void RegisterCustomScheme() {
#ifndef TDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME #ifndef TDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME
DEBUG_LOG(("App Info: Checking custom scheme 'tg'..")); DEBUG_LOG(("App Info: Checking custom scheme 'tg'..."));
HKEY rkey; HKEY rkey;
QString exe = QDir::toNativeSeparators(cExeDir() + cExeName()); QString exe = QDir::toNativeSeparators(cExeDir() + cExeName());
@ -3385,7 +3385,7 @@ void CheckPinnedAppUserModelId() {
BOOL srcres = GetFileInformationByHandle(srcfile, &srcinfo); BOOL srcres = GetFileInformationByHandle(srcfile, &srcinfo);
CloseHandle(srcfile); CloseHandle(srcfile);
if (!srcres) return; if (!srcres) return;
LOG(("Checking..")); LOG(("Checking..."));
WIN32_FIND_DATA findData; WIN32_FIND_DATA findData;
HANDLE findHandle = FindFirstFileEx((p + L"*").c_str(), FindExInfoStandard, &findData, FindExSearchNameMatch, 0, 0); HANDLE findHandle = FindFirstFileEx((p + L"*").c_str(), FindExInfoStandard, &findData, FindExSearchNameMatch, 0, 0);
if (findHandle == INVALID_HANDLE_VALUE) { if (findHandle == INVALID_HANDLE_VALUE) {
@ -3431,7 +3431,7 @@ void CheckPinnedAppUserModelId() {
PROPVARIANT appIdPropVar; PROPVARIANT appIdPropVar;
hr = propertyStore->GetValue(pkey_AppUserModel_ID, &appIdPropVar); hr = propertyStore->GetValue(pkey_AppUserModel_ID, &appIdPropVar);
if (!SUCCEEDED(hr)) return; if (!SUCCEEDED(hr)) return;
LOG(("Reading..")); LOG(("Reading..."));
WCHAR already[MAX_PATH]; WCHAR already[MAX_PATH];
hr = propVariantToString(appIdPropVar, already, MAX_PATH); hr = propVariantToString(appIdPropVar, already, MAX_PATH);
if (SUCCEEDED(hr)) { if (SUCCEEDED(hr)) {

8
Telegram/SourceFiles/pspecific_winrt.cpp
View File

@ -2210,7 +2210,7 @@ namespace {
//} //}
//bool _psOpenRegKey(LPCWSTR key, PHKEY rkey) { //bool _psOpenRegKey(LPCWSTR key, PHKEY rkey) {
// DEBUG_LOG(("App Info: opening reg key %1..").arg(QString::fromStdWString(key))); // DEBUG_LOG(("App Info: opening reg key %1...").arg(QString::fromStdWString(key)));
// LSTATUS status = RegOpenKeyEx(HKEY_CURRENT_USER, key, 0, KEY_QUERY_VALUE | KEY_WRITE, rkey); // LSTATUS status = RegOpenKeyEx(HKEY_CURRENT_USER, key, 0, KEY_QUERY_VALUE | KEY_WRITE, rkey);
// if (status != ERROR_SUCCESS) { // if (status != ERROR_SUCCESS) {
// if (status == ERROR_FILE_NOT_FOUND) { // if (status == ERROR_FILE_NOT_FOUND) {
@ -2249,7 +2249,7 @@ namespace {
void RegisterCustomScheme() { void RegisterCustomScheme() {
#ifndef TDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME #ifndef TDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME
DEBUG_LOG(("App Info: Checking custom scheme 'tg'..")); DEBUG_LOG(("App Info: Checking custom scheme 'tg'..."));
//HKEY rkey; //HKEY rkey;
//QString exe = QDir::toNativeSeparators(cExeDir() + cExeName()); //QString exe = QDir::toNativeSeparators(cExeDir() + cExeName());
@ -2799,7 +2799,7 @@ void CheckPinnedAppUserModelId() {
//BOOL srcres = GetFileInformationByHandle(srcfile, &srcinfo); //BOOL srcres = GetFileInformationByHandle(srcfile, &srcinfo);
//CloseHandle(srcfile); //CloseHandle(srcfile);
//if (!srcres) return; //if (!srcres) return;
//LOG(("Checking..")); //LOG(("Checking..."));
//WIN32_FIND_DATA findData; //WIN32_FIND_DATA findData;
//HANDLE findHandle = FindFirstFileEx((p + L"*").c_str(), FindExInfoStandard, &findData, FindExSearchNameMatch, 0, 0); //HANDLE findHandle = FindFirstFileEx((p + L"*").c_str(), FindExInfoStandard, &findData, FindExSearchNameMatch, 0, 0);
//if (findHandle == INVALID_HANDLE_VALUE) { //if (findHandle == INVALID_HANDLE_VALUE) {
@ -2845,7 +2845,7 @@ void CheckPinnedAppUserModelId() {
// PROPVARIANT appIdPropVar; // PROPVARIANT appIdPropVar;
// hr = propertyStore->GetValue(pkey_AppUserModel_ID, &appIdPropVar); // hr = propertyStore->GetValue(pkey_AppUserModel_ID, &appIdPropVar);
// if (!SUCCEEDED(hr)) return; // if (!SUCCEEDED(hr)) return;
// LOG(("Reading..")); // LOG(("Reading..."));
// WCHAR already[MAX_PATH]; // WCHAR already[MAX_PATH];
// hr = propVariantToString(appIdPropVar, already, MAX_PATH); // hr = propVariantToString(appIdPropVar, already, MAX_PATH);
// if (SUCCEEDED(hr)) { // if (SUCCEEDED(hr)) {

2
Telegram/SourceFiles/types.cpp
View File

@ -290,7 +290,7 @@ namespace ThirdParty {
uchar sha256Buffer[32]; uchar sha256Buffer[32];
RAND_seed(hashSha256(buf, 16, sha256Buffer), 32); RAND_seed(hashSha256(buf, 16, sha256Buffer), 32);
if (!RAND_status()) { if (!RAND_status()) {
LOG(("MTP Error: Could not init OpenSSL rand, RAND_status() is 0..")); LOG(("MTP Error: Could not init OpenSSL rand, RAND_status() is 0..."));
} }
} }

8
Telegram/SourceFiles/window.cpp
View File

@ -2348,7 +2348,7 @@ void LastCrashedWindow::onSendReport() {
connect(_checkReply, SIGNAL(error(QNetworkReply::NetworkError)), this, SLOT(onSendingError(QNetworkReply::NetworkError))); connect(_checkReply, SIGNAL(error(QNetworkReply::NetworkError)), this, SLOT(onSendingError(QNetworkReply::NetworkError)));
connect(_checkReply, SIGNAL(finished()), this, SLOT(onCheckingFinished())); connect(_checkReply, SIGNAL(finished()), this, SLOT(onCheckingFinished()));
_pleaseSendReport.setText(qsl("Sending crash report..")); _pleaseSendReport.setText(qsl("Sending crash report..."));
_sendingState = SendingProgress; _sendingState = SendingProgress;
_reportShown = false; _reportShown = false;
updateControls(); updateControls();
@ -2816,7 +2816,7 @@ void LastCrashedWindow::setUpdatingState(UpdatingState state, bool force) {
} }
break; break;
case UpdatingCheck: case UpdatingCheck:
_updating.setText(qsl("Checking for updates..")); _updating.setText(qsl("Checking for updates..."));
break; break;
case UpdatingFail: case UpdatingFail:
_updating.setText(qsl("Update check failed :(")); _updating.setText(qsl("Update check failed :("));
@ -2923,9 +2923,9 @@ void LastCrashedWindow::onSendingProgress(qint64 uploaded, qint64 total) {
_sendingState = SendingUploading; _sendingState = SendingUploading;
if (total < 0) { if (total < 0) {
_pleaseSendReport.setText(qsl("Sending crash report %1 KB..").arg(uploaded / 1024)); _pleaseSendReport.setText(qsl("Sending crash report %1 KB...").arg(uploaded / 1024));
} else { } else {
_pleaseSendReport.setText(qsl("Sending crash report %1 / %2 KB..").arg(uploaded / 1024).arg(total / 1024)); _pleaseSendReport.setText(qsl("Sending crash report %1 / %2 KB...").arg(uploaded / 1024).arg(total / 1024));
} }
updateControls(); updateControls();
} }