diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt index a90315e05..1b1379cf5 100644 --- a/Telegram/CMakeLists.txt +++ b/Telegram/CMakeLists.txt @@ -445,7 +445,6 @@ set(APP_SRC SourceFiles/app.cpp SourceFiles/application.cpp SourceFiles/auth_session.cpp - SourceFiles/autoupdater.cpp SourceFiles/facades.cpp SourceFiles/layerwidget.cpp SourceFiles/layout.cpp @@ -672,23 +671,3 @@ cotire(Telegram) # See https://github.com/sakra/cotire/blob/master/MANUAL.md#objective-c # ObjC and ObjC++ files cannot be cotired, so they have to include appropriate Qt and Tg # headers themselves, this applies to macOS platform sources. - -##====================== - -# if (APPLE) -# set(UPD_SRC SourceFiles/_other/updater_osx.m) -# endif() -# if (WIN32) -# set(UPD_SRC SourceFiles/_other/updater.cpp) -# endif() -# if (LINUX) -# set(UPD_SRC SourceFiles/_other/updater_linux.cpp) -# endif() - -##====================== -## Updater -##====================== - -#add_executable(Updater ${UPD_SRC}) -#cotire(Updater) - diff --git a/Telegram/SourceFiles/_other/packer.cpp b/Telegram/SourceFiles/_other/packer.cpp deleted file mode 100644 index 4fe9530dc..000000000 --- a/Telegram/SourceFiles/_other/packer.cpp +++ /dev/null @@ -1,539 +0,0 @@ -/* -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 "packer.h" - -#include - -#ifdef Q_OS_MAC -//Q_IMPORT_PLUGIN(QCocoaIntegrationPlugin) -#endif - -bool AlphaChannel = false; -quint64 BetaVersion = 0; - -const char *PublicKey = "\ ------BEGIN RSA PUBLIC KEY-----\n\ -MIGJAoGBAMA4ViQrjkPZ9xj0lrer3r23JvxOnrtE8nI69XLGSr+sRERz9YnUptnU\n\ -BZpkIfKaRcl6XzNJiN28cVwO1Ui5JSa814UAiDHzWUqCaXUiUEQ6NmNTneiGx2sQ\n\ -+9PKKlb8mmr3BB9A45ZNwLT6G9AK3+qkZLHojeSA+m84/a6GP4svAgMBAAE=\n\ ------END RSA PUBLIC KEY-----\ -"; - -const char *PublicAlphaKey = "\ ------BEGIN RSA PUBLIC KEY-----\n\ -MIGJAoGBALWu9GGs0HED7KG7BM73CFZ6o0xufKBRQsdnq3lwA8nFQEvmdu+g/I1j\n\ -0LQ+0IQO7GW4jAgzF/4+soPDb6uHQeNFrlVx1JS9DZGhhjZ5rf65yg11nTCIHZCG\n\ -w/CVnbwQOw0g5GBwwFV3r0uTTvy44xx8XXxk+Qknu4eBCsmrAFNnAgMBAAE=\n\ ------END RSA PUBLIC KEY-----\ -"; - -extern const char *PrivateKey; -extern const char *PrivateAlphaKey; -#include "../../../../TelegramPrivate/packer_private.h" // RSA PRIVATE KEYS for update signing -#include "../../../../TelegramPrivate/beta_private.h" // private key for beta version file generation - -QString countBetaVersionSignature(quint64 version); - -// sha1 hash -typedef unsigned char uchar; -typedef unsigned int uint32; -typedef signed int int32; - -namespace{ - -inline uint32 sha1Shift(uint32 v, uint32 shift) { - return ((v << shift) | (v >> (32 - shift))); -} - -void sha1PartHash(uint32 *sha, uint32 *temp) { - uint32 a = sha[0], b = sha[1], c = sha[2], d = sha[3], e = sha[4], round = 0; - -#define _shiftswap(f, v) { \ - uint32 t = sha1Shift(a, 5) + (f) + e + v + temp[round]; \ - e = d; \ - d = c; \ - c = sha1Shift(b, 30); \ - b = a; \ - a = t; \ - ++round; \ - } - -#define _shiftshiftswap(f, v) { \ - temp[round] = sha1Shift((temp[round - 3] ^ temp[round - 8] ^ temp[round - 14] ^ temp[round - 16]), 1); \ - _shiftswap(f, v) \ - } - - while (round < 16) _shiftswap((b & c) | (~b & d), 0x5a827999) - while (round < 20) _shiftshiftswap((b & c) | (~b & d), 0x5a827999) - while (round < 40) _shiftshiftswap(b ^ c ^ d, 0x6ed9eba1) - while (round < 60) _shiftshiftswap((b & c) | (b & d) | (c & d), 0x8f1bbcdc) - while (round < 80) _shiftshiftswap(b ^ c ^ d, 0xca62c1d6) - -#undef _shiftshiftswap -#undef _shiftswap - - sha[0] += a; - sha[1] += b; - sha[2] += c; - sha[3] += d; - sha[4] += e; -} - -} // namespace - -int32 *hashSha1(const void *data, uint32 len, void *dest) { - const uchar *buf = (const uchar *)data; - - uint32 temp[80], block = 0, end; - uint32 sha[5] = {0x67452301, 0xefcdab89, 0x98badcfe, 0x10325476, 0xc3d2e1f0}; - for (end = block + 64; block + 64 <= len; end = block + 64) { - for (uint32 i = 0; block < end; block += 4) { - temp[i++] = (uint32) buf[block + 3] - | (((uint32) buf[block + 2]) << 8) - | (((uint32) buf[block + 1]) << 16) - | (((uint32) buf[block]) << 24); - } - sha1PartHash(sha, temp); - } - - end = len - block; - memset(temp, 0, sizeof(uint32) * 16); - uint32 last = 0; - for (; last < end; ++last) { - temp[last >> 2] |= (uint32)buf[last + block] << ((3 - (last & 0x03)) << 3); - } - temp[last >> 2] |= 0x80 << ((3 - (last & 3)) << 3); - if (end >= 56) { - sha1PartHash(sha, temp); - memset(temp, 0, sizeof(uint32) * 16); - } - temp[15] = len << 3; - sha1PartHash(sha, temp); - - uchar *sha1To = (uchar*)dest; - - for (int32 i = 19; i >= 0; --i) { - sha1To[i] = (sha[i >> 2] >> (((3 - i) & 0x03) << 3)) & 0xFF; - } - - return (int32*)sha1To; -} - -QString BetaSignature; - -int main(int argc, char *argv[]) -{ - QString workDir; - - QString remove; - int version = 0; - bool target32 = false; - QFileInfoList files; - for (int i = 0; i < argc; ++i) { - if (string("-path") == argv[i] && i + 1 < argc) { - QString path = workDir + QString(argv[i + 1]); - QFileInfo info(path); - files.push_back(info); - if (remove.isEmpty()) remove = info.canonicalPath() + "/"; - } else if (string("-target") == argv[i] && i + 1 < argc) { - target32 = (string("mac32") == argv[i + 1]); - } else if (string("-version") == argv[i] && i + 1 < argc) { - version = QString(argv[i + 1]).toInt(); - } else if (string("-alpha") == argv[i]) { - AlphaChannel = true; - } else if (string("-beta") == argv[i] && i + 1 < argc) { - BetaVersion = QString(argv[i + 1]).toULongLong(); - if (BetaVersion > version * 1000ULL && BetaVersion < (version + 1) * 1000ULL) { - AlphaChannel = false; - BetaSignature = countBetaVersionSignature(BetaVersion); - if (BetaSignature.isEmpty()) { - return -1; - } - } else { - cout << "Bad -beta param value passed, should be for the same version: " << version << ", beta: " << BetaVersion << "\n"; - return -1; - } - } - } - - if (files.isEmpty() || remove.isEmpty() || version <= 1016 || version > 999999999) { -#ifdef Q_OS_WIN - cout << "Usage: Packer.exe -path {file} -version {version} OR Packer.exe -path {dir} -version {version}\n"; -#elif defined Q_OS_MAC - cout << "Usage: Packer.app -path {file} -version {version} OR Packer.app -path {dir} -version {version}\n"; -#else - cout << "Usage: Packer -path {file} -version {version} OR Packer -path {dir} -version {version}\n"; -#endif - return -1; - } - - bool hasDirs = true; - while (hasDirs) { - hasDirs = false; - for (QFileInfoList::iterator i = files.begin(); i != files.end(); ++i) { - QFileInfo info(*i); - QString fullPath = info.canonicalFilePath(); - if (info.isDir()) { - hasDirs = true; - files.erase(i); - QDir d = QDir(info.absoluteFilePath()); - QString fullDir = d.canonicalPath(); - QStringList entries = d.entryList(QDir::Files | QDir::Dirs | QDir::NoSymLinks | QDir::NoDotAndDotDot); - files.append(d.entryInfoList(QDir::Files | QDir::Dirs | QDir::NoSymLinks | QDir::NoDotAndDotDot)); - break; - } else if (!info.isReadable()) { - cout << "Can't read: " << info.absoluteFilePath().toUtf8().constData() << "\n"; - return -1; - } else if (info.isHidden()) { - hasDirs = true; - files.erase(i); - break; - } - } - } - for (QFileInfoList::iterator i = files.begin(); i != files.end(); ++i) { - QFileInfo info(*i); - if (!info.canonicalFilePath().startsWith(remove)) { - cout << "Can't find '" << remove.toUtf8().constData() << "' in file '" << info.canonicalFilePath().toUtf8().constData() << "' :(\n"; - return -1; - } - } - - QByteArray result; - { - QBuffer buffer(&result); - buffer.open(QIODevice::WriteOnly); - QDataStream stream(&buffer); - stream.setVersion(QDataStream::Qt_5_1); - - if (BetaVersion) { - stream << quint32(0x7FFFFFFF); - stream << quint64(BetaVersion); - } else { - stream << quint32(version); - } - - stream << quint32(files.size()); - cout << "Found " << files.size() << " file" << (files.size() == 1 ? "" : "s") << "..\n"; - for (QFileInfoList::iterator i = files.begin(); i != files.end(); ++i) { - QFileInfo info(*i); - QString fullName = info.canonicalFilePath(); - QString name = fullName.mid(remove.length()); - cout << name.toUtf8().constData() << " (" << info.size() << ")\n"; - - QFile f(fullName); - if (!f.open(QIODevice::ReadOnly)) { - cout << "Can't open '" << fullName.toUtf8().constData() << "' for read..\n"; - return -1; - } - QByteArray inner = f.readAll(); - stream << name << quint32(inner.size()) << inner; -#if defined Q_OS_MAC || defined Q_OS_LINUX - stream << (QFileInfo(fullName).isExecutable() ? true : false); -#endif - } - if (stream.status() != QDataStream::Ok) { - cout << "Stream status is bad: " << stream.status() << "\n"; - return -1; - } - } - - int32 resultSize = result.size(); - cout << "Compression start, size: " << resultSize << "\n"; - - QByteArray compressed, resultCheck; -#ifdef Q_OS_WIN // use Lzma SDK for win - const int32 hSigLen = 128, hShaLen = 20, hPropsLen = LZMA_PROPS_SIZE, hOriginalSizeLen = sizeof(int32), hSize = hSigLen + hShaLen + hPropsLen + hOriginalSizeLen; // header - - compressed.resize(hSize + resultSize + 1024 * 1024); // rsa signature + sha1 + lzma props + max compressed size - - size_t compressedLen = compressed.size() - hSize; - size_t outPropsSize = LZMA_PROPS_SIZE; - uchar *_dest = (uchar*)(compressed.data() + hSize); - size_t *_destLen = &compressedLen; - const uchar *_src = (const uchar*)(result.constData()); - size_t _srcLen = result.size(); - uchar *_outProps = (uchar*)(compressed.data() + hSigLen + hShaLen); - int res = LzmaCompress(_dest, _destLen, _src, _srcLen, _outProps, &outPropsSize, 9, 64 * 1024 * 1024, 4, 0, 2, 273, 2); - if (res != SZ_OK) { - cout << "Error in compression: " << res << "\n"; - return -1; - } - compressed.resize(int(hSize + compressedLen)); - memcpy(compressed.data() + hSigLen + hShaLen + hPropsLen, &resultSize, hOriginalSizeLen); - - cout << "Compressed to size: " << compressedLen << "\n"; - - cout << "Checking uncompressed..\n"; - - int32 resultCheckLen; - memcpy(&resultCheckLen, compressed.constData() + hSigLen + hShaLen + hPropsLen, hOriginalSizeLen); - if (resultCheckLen <= 0 || resultCheckLen > 1024 * 1024 * 1024) { - cout << "Bad result len: " << resultCheckLen << "\n"; - return -1; - } - resultCheck.resize(resultCheckLen); - - size_t resultLen = resultCheck.size(); - SizeT srcLen = compressedLen; - int uncompressRes = LzmaUncompress((uchar*)resultCheck.data(), &resultLen, (const uchar*)(compressed.constData() + hSize), &srcLen, (const uchar*)(compressed.constData() + hSigLen + hShaLen), LZMA_PROPS_SIZE); - if (uncompressRes != SZ_OK) { - cout << "Uncompress failed: " << uncompressRes << "\n"; - return -1; - } - if (resultLen != size_t(result.size())) { - cout << "Uncompress bad size: " << resultLen << ", was: " << result.size() << "\n"; - return -1; - } -#else // use liblzma for others - const int32 hSigLen = 128, hShaLen = 20, hPropsLen = 0, hOriginalSizeLen = sizeof(int32), hSize = hSigLen + hShaLen + hOriginalSizeLen; // header - - compressed.resize(hSize + resultSize + 1024 * 1024); // rsa signature + sha1 + lzma props + max compressed size - - size_t compressedLen = compressed.size() - hSize; - - lzma_stream stream = LZMA_STREAM_INIT; - - int preset = 9 | LZMA_PRESET_EXTREME; - lzma_ret ret = lzma_easy_encoder(&stream, preset, LZMA_CHECK_CRC64); - if (ret != LZMA_OK) { - const char *msg; - switch (ret) { - case LZMA_MEM_ERROR: msg = "Memory allocation failed"; break; - case LZMA_OPTIONS_ERROR: msg = "Specified preset is not supported"; break; - case LZMA_UNSUPPORTED_CHECK: msg = "Specified integrity check is not supported"; break; - default: msg = "Unknown error, possibly a bug"; break; - } - cout << "Error initializing the encoder: " << msg << " (error code " << ret << ")\n"; - return -1; - } - - stream.avail_in = resultSize; - stream.next_in = (uint8_t*)result.constData(); - stream.avail_out = compressedLen; - stream.next_out = (uint8_t*)(compressed.data() + hSize); - - lzma_ret res = lzma_code(&stream, LZMA_FINISH); - compressedLen -= stream.avail_out; - lzma_end(&stream); - if (res != LZMA_OK && res != LZMA_STREAM_END) { - const char *msg; - switch (res) { - case LZMA_MEM_ERROR: msg = "Memory allocation failed"; break; - case LZMA_DATA_ERROR: msg = "File size limits exceeded"; break; - default: msg = "Unknown error, possibly a bug"; break; - } - cout << "Error in compression: " << msg << " (error code " << res << ")\n"; - return -1; - } - - compressed.resize(int(hSize + compressedLen)); - memcpy(compressed.data() + hSigLen + hShaLen, &resultSize, hOriginalSizeLen); - - cout << "Compressed to size: " << compressedLen << "\n"; - - cout << "Checking uncompressed..\n"; - - int32 resultCheckLen; - memcpy(&resultCheckLen, compressed.constData() + hSigLen + hShaLen, hOriginalSizeLen); - if (resultCheckLen <= 0 || resultCheckLen > 1024 * 1024 * 1024) { - cout << "Bad result len: " << resultCheckLen << "\n"; - return -1; - } - resultCheck.resize(resultCheckLen); - - size_t resultLen = resultCheck.size(); - - stream = LZMA_STREAM_INIT; - - ret = lzma_stream_decoder(&stream, UINT64_MAX, LZMA_CONCATENATED); - if (ret != LZMA_OK) { - const char *msg; - switch (ret) { - case LZMA_MEM_ERROR: msg = "Memory allocation failed"; break; - case LZMA_OPTIONS_ERROR: msg = "Specified preset is not supported"; break; - case LZMA_UNSUPPORTED_CHECK: msg = "Specified integrity check is not supported"; break; - default: msg = "Unknown error, possibly a bug"; break; - } - cout << "Error initializing the decoder: " << msg << " (error code " << ret << ")\n"; - return -1; - } - - stream.avail_in = compressedLen; - stream.next_in = (uint8_t*)(compressed.constData() + hSize); - stream.avail_out = resultLen; - stream.next_out = (uint8_t*)resultCheck.data(); - - res = lzma_code(&stream, LZMA_FINISH); - if (stream.avail_in) { - cout << "Error in decompression, " << stream.avail_in << " bytes left in _in of " << compressedLen << " whole.\n"; - return -1; - } else if (stream.avail_out) { - cout << "Error in decompression, " << stream.avail_out << " bytes free left in _out of " << resultLen << " whole.\n"; - return -1; - } - lzma_end(&stream); - if (res != LZMA_OK && res != LZMA_STREAM_END) { - const char *msg; - switch (res) { - case LZMA_MEM_ERROR: msg = "Memory allocation failed"; break; - case LZMA_FORMAT_ERROR: msg = "The input data is not in the .xz format"; break; - case LZMA_OPTIONS_ERROR: msg = "Unsupported compression options"; break; - case LZMA_DATA_ERROR: msg = "Compressed file is corrupt"; break; - case LZMA_BUF_ERROR: msg = "Compressed data is truncated or otherwise corrupt"; break; - default: msg = "Unknown error, possibly a bug"; break; - } - cout << "Error in decompression: " << msg << " (error code " << res << ")\n"; - return -1; - } -#endif - if (memcmp(result.constData(), resultCheck.constData(), resultLen)) { - cout << "Data differ :(\n"; - return -1; - } - /**/ - result = resultCheck = QByteArray(); - - cout << "Counting SHA1 hash..\n"; - - uchar sha1Buffer[20]; - memcpy(compressed.data() + hSigLen, hashSha1(compressed.constData() + hSigLen + hShaLen, uint32(compressedLen + hPropsLen + hOriginalSizeLen), sha1Buffer), hShaLen); // count sha1 - - uint32 siglen = 0; - - cout << "Signing..\n"; - RSA *prKey = PEM_read_bio_RSAPrivateKey(BIO_new_mem_buf(const_cast((AlphaChannel || BetaVersion) ? PrivateAlphaKey : PrivateKey), -1), 0, 0, 0); - if (!prKey) { - cout << "Could not read RSA private key!\n"; - return -1; - } - if (RSA_size(prKey) != hSigLen) { - cout << "Bad private key, size: " << RSA_size(prKey) << "\n"; - RSA_free(prKey); - return -1; - } - if (RSA_sign(NID_sha1, (const uchar*)(compressed.constData() + hSigLen), hShaLen, (uchar*)(compressed.data()), &siglen, prKey) != 1) { // count signature - cout << "Signing failed!\n"; - RSA_free(prKey); - return -1; - } - RSA_free(prKey); - - if (siglen != hSigLen) { - cout << "Bad signature length: " << siglen << "\n"; - return -1; - } - - cout << "Checking signature..\n"; - RSA *pbKey = PEM_read_bio_RSAPublicKey(BIO_new_mem_buf(const_cast((AlphaChannel || BetaVersion) ? PublicAlphaKey : PublicKey), -1), 0, 0, 0); - if (!pbKey) { - cout << "Could not read RSA public key!\n"; - return -1; - } - if (RSA_verify(NID_sha1, (const uchar*)(compressed.constData() + hSigLen), hShaLen, (const uchar*)(compressed.constData()), siglen, pbKey) != 1) { // verify signature - RSA_free(pbKey); - cout << "Signature verification failed!\n"; - return -1; - } - cout << "Signature verified!\n"; - RSA_free(pbKey); -#ifdef Q_OS_WIN - QString outName(QString("tupdate%1").arg(BetaVersion ? BetaVersion : version)); -#elif defined Q_OS_MAC - QString outName((target32 ? QString("tmac32upd%1") : QString("tmacupd%1")).arg(BetaVersion ? BetaVersion : version)); -#elif defined Q_OS_LINUX32 - QString outName(QString("tlinux32upd%1").arg(BetaVersion ? BetaVersion : version)); -#elif defined Q_OS_LINUX64 - QString outName(QString("tlinuxupd%1").arg(BetaVersion ? BetaVersion : version)); -#else -#error Unknown platform! -#endif - if (BetaVersion) { - outName += "_" + BetaSignature; - } - QFile out(outName); - if (!out.open(QIODevice::WriteOnly)) { - cout << "Can't open '" << outName.toUtf8().constData() << "' for write..\n"; - return -1; - } - out.write(compressed); - out.close(); - - if (BetaVersion) { - QString keyName(QString("tbeta_%1_key").arg(BetaVersion)); - QFile key(keyName); - if (!key.open(QIODevice::WriteOnly)) { - cout << "Can't open '" << keyName.toUtf8().constData() << "' for write..\n"; - return -1; - } - key.write(BetaSignature.toUtf8()); - key.close(); - } - - cout << "Update file '" << outName.toUtf8().constData() << "' written successfully!\n"; - - return 0; -} - -QString countBetaVersionSignature(quint64 version) { // duplicated in autoupdate.cpp - QByteArray cBetaPrivateKey(BetaPrivateKey); - if (cBetaPrivateKey.isEmpty()) { - cout << "Error: Trying to count beta version signature without beta private key!\n"; - return QString(); - } - - QByteArray signedData = (QLatin1String("TelegramBeta_") + QString::number(version, 16).toLower()).toUtf8(); - - static const int32 shaSize = 20, keySize = 128; - - uchar sha1Buffer[shaSize]; - hashSha1(signedData.constData(), signedData.size(), sha1Buffer); // count sha1 - - uint32 siglen = 0; - - RSA *prKey = PEM_read_bio_RSAPrivateKey(BIO_new_mem_buf(const_cast(cBetaPrivateKey.constData()), -1), 0, 0, 0); - if (!prKey) { - cout << "Error: Could not read beta private key!\n"; - return QString(); - } - if (RSA_size(prKey) != keySize) { - cout << "Error: Bad beta private key size: " << RSA_size(prKey) << "\n"; - RSA_free(prKey); - return QString(); - } - QByteArray signature; - signature.resize(keySize); - if (RSA_sign(NID_sha1, (const uchar*)(sha1Buffer), shaSize, (uchar*)(signature.data()), &siglen, prKey) != 1) { // count signature - cout << "Error: Counting beta version signature failed!\n"; - RSA_free(prKey); - return QString(); - } - RSA_free(prKey); - - if (siglen != keySize) { - cout << "Error: Bad beta version signature length: " << siglen << "\n"; - return QString(); - } - - signature = signature.toBase64(QByteArray::Base64UrlEncoding | QByteArray::OmitTrailingEquals); - signature = signature.replace('-', '8').replace('_', 'B'); - return QString::fromUtf8(signature.mid(19, 32)); -} diff --git a/Telegram/SourceFiles/_other/packer.h b/Telegram/SourceFiles/_other/packer.h deleted file mode 100644 index 2cef45d82..000000000 --- a/Telegram/SourceFiles/_other/packer.h +++ /dev/null @@ -1,52 +0,0 @@ -/* -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 -#include -#include -#include -#include -#include -#include - -#include - -#include -#include -#include -#include -#include -#include -#include - -#ifdef Q_OS_WIN // use Lzma SDK for win -#include -#else -#include -#endif - -#include -#include -#include -using std::string; -using std::wstring; -using std::cout; \ No newline at end of file diff --git a/Telegram/SourceFiles/_other/updater.cpp b/Telegram/SourceFiles/_other/updater.cpp deleted file mode 100644 index dbcce3137..000000000 --- a/Telegram/SourceFiles/_other/updater.cpp +++ /dev/null @@ -1,590 +0,0 @@ -/* -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 "updater.h" - -bool _debug = false; - -wstring updaterName, updaterDir, updateTo, exeName; - -bool equal(const wstring &a, const wstring &b) { - return !_wcsicmp(a.c_str(), b.c_str()); -} - -void updateError(const WCHAR *msg, DWORD errorCode) { - WCHAR errMsg[2048]; - LPWSTR errorText = NULL, errorTextDefault = L"(Unknown error)"; - FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_IGNORE_INSERTS, NULL, errorCode, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPWSTR)&errorText, 0, 0); - if (!errorText) { - errorText = errorTextDefault; - } - wsprintf(errMsg, L"%s, error code: %d\nError message: %s", msg, errorCode, errorText); - - MessageBox(0, errMsg, L"Update error!", MB_ICONERROR); - - if (errorText != errorTextDefault) { - LocalFree(errorText); - } -} - -HANDLE _logFile = 0; -void openLog() { - if (!_debug || _logFile) return; - wstring logPath = L"DebugLogs"; - if (!CreateDirectory(logPath.c_str(), NULL)) { - DWORD errorCode = GetLastError(); - if (errorCode && errorCode != ERROR_ALREADY_EXISTS) { - updateError(L"Failed to create log directory", errorCode); - return; - } - } - - SYSTEMTIME stLocalTime; - - GetLocalTime(&stLocalTime); - - static const int maxFileLen = MAX_PATH * 10; - WCHAR logName[maxFileLen]; - wsprintf(logName, L"DebugLogs\\%04d%02d%02d_%02d%02d%02d_upd.txt", - stLocalTime.wYear, stLocalTime.wMonth, stLocalTime.wDay, - stLocalTime.wHour, stLocalTime.wMinute, stLocalTime.wSecond); - _logFile = CreateFile(logName, GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, 0, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, 0); - if (_logFile == INVALID_HANDLE_VALUE) { // :( - updateError(L"Failed to create log file", GetLastError()); - _logFile = 0; - return; - } -} - -void closeLog() { - if (!_logFile) return; - - CloseHandle(_logFile); - _logFile = 0; -} - -void writeLog(const wstring &msg) { - if (!_logFile) return; - - wstring full = msg + L'\n'; - DWORD written = 0; - BOOL result = WriteFile(_logFile, full.c_str(), full.size() * sizeof(wchar_t), &written, 0); - if (!result) { - updateError((L"Failed to write log entry '" + msg + L"'").c_str(), GetLastError()); - closeLog(); - return; - } - BOOL flushr = FlushFileBuffers(_logFile); - if (!flushr) { - updateError((L"Failed to flush log on entry '" + msg + L"'").c_str(), GetLastError()); - closeLog(); - return; - } -} - -void fullClearPath(const wstring &dir) { - WCHAR path[4096]; - memcpy(path, dir.c_str(), (dir.size() + 1) * sizeof(WCHAR)); - path[dir.size() + 1] = 0; - writeLog(L"Fully clearing path '" + dir + L"'.."); - SHFILEOPSTRUCT file_op = { - NULL, - FO_DELETE, - path, - L"", - FOF_NOCONFIRMATION | - FOF_NOERRORUI | - FOF_SILENT, - false, - 0, - L"" - }; - int res = SHFileOperation(&file_op); - if (res) writeLog(L"Error: failed to clear path! :("); -} - -void delFolder() { - wstring delPathOld = L"tupdates\\ready", delPath = L"tupdates\\temp", delFolder = L"tupdates"; - fullClearPath(delPathOld); - fullClearPath(delPath); - RemoveDirectory(delFolder.c_str()); -} - -DWORD versionNum = 0, versionLen = 0, readLen = 0; -WCHAR versionStr[32] = { 0 }; - -bool update() { - writeLog(L"Update started.."); - - wstring updDir = L"tupdates\\temp", readyFilePath = L"tupdates\\temp\\ready", tdataDir = L"tupdates\\temp\\tdata"; - { - HANDLE readyFile = CreateFile(readyFilePath.c_str(), GENERIC_READ, FILE_SHARE_READ, 0, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0); - if (readyFile != INVALID_HANDLE_VALUE) { - CloseHandle(readyFile); - } else { - updDir = L"tupdates\\ready"; // old - tdataDir = L"tupdates\\ready\\tdata"; - } - } - - HANDLE versionFile = CreateFile((tdataDir + L"\\version").c_str(), GENERIC_READ, FILE_SHARE_READ, 0, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0); - if (versionFile != INVALID_HANDLE_VALUE) { - if (!ReadFile(versionFile, &versionNum, sizeof(DWORD), &readLen, NULL) || readLen != sizeof(DWORD)) { - versionNum = 0; - } else { - if (versionNum == 0x7FFFFFFF) { // beta version - - } else if (!ReadFile(versionFile, &versionLen, sizeof(DWORD), &readLen, NULL) || readLen != sizeof(DWORD) || versionLen > 63) { - versionNum = 0; - } else if (!ReadFile(versionFile, versionStr, versionLen, &readLen, NULL) || readLen != versionLen) { - versionNum = 0; - } - } - CloseHandle(versionFile); - writeLog(L"Version file read."); - } else { - writeLog(L"Could not open version file to update registry :("); - } - - deque dirs; - dirs.push_back(updDir); - - deque from, to, forcedirs; - - do { - wstring dir = dirs.front(); - dirs.pop_front(); - - wstring toDir = updateTo; - if (dir.size() > updDir.size() + 1) { - toDir += (dir.substr(updDir.size() + 1) + L"\\"); - forcedirs.push_back(toDir); - writeLog(L"Parsing dir '" + toDir + L"' in update tree.."); - } - - WIN32_FIND_DATA findData; - HANDLE findHandle = FindFirstFileEx((dir + L"\\*").c_str(), FindExInfoStandard, &findData, FindExSearchNameMatch, 0, 0); - if (findHandle == INVALID_HANDLE_VALUE) { - DWORD errorCode = GetLastError(); - if (errorCode == ERROR_PATH_NOT_FOUND) { // no update is ready - return true; - } - writeLog(L"Error: failed to find update files :("); - updateError(L"Failed to find update files", errorCode); - delFolder(); - return false; - } - - do { - wstring fname = dir + L"\\" + findData.cFileName; - if (fname.substr(0, tdataDir.size()) == tdataDir && (fname.size() <= tdataDir.size() || fname.at(tdataDir.size()) == '/')) { - writeLog(L"Skipped 'tdata' path '" + fname + L"'"); - } else if (findData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) { - if (findData.cFileName != wstring(L".") && findData.cFileName != wstring(L"..")) { - dirs.push_back(fname); - writeLog(L"Added dir '" + fname + L"' in update tree.."); - } - } else { - wstring tofname = updateTo + fname.substr(updDir.size() + 1); - if (equal(tofname, updaterName)) { // bad update - has Updater.exe - delete all dir - writeLog(L"Error: bad update, has Updater.exe! '" + tofname + L"' equal '" + updaterName + L"'"); - delFolder(); - return false; - } else if (equal(tofname, updateTo + L"Telegram.exe") && exeName != L"Telegram.exe") { - wstring fullBinaryPath = updateTo + exeName; - writeLog(L"Target binary found: '" + tofname + L"', changing to '" + fullBinaryPath + L"'"); - tofname = fullBinaryPath; - } - if (equal(fname, readyFilePath)) { - writeLog(L"Skipped ready file '" + fname + L"'"); - } else { - from.push_back(fname); - to.push_back(tofname); - writeLog(L"Added file '" + fname + L"' to be copied to '" + tofname + L"'"); - } - } - } while (FindNextFile(findHandle, &findData)); - DWORD errorCode = GetLastError(); - if (errorCode && errorCode != ERROR_NO_MORE_FILES) { // everything is found - writeLog(L"Error: failed to find next update file :("); - updateError(L"Failed to find next update file", errorCode); - delFolder(); - return false; - } - FindClose(findHandle); - } while (!dirs.empty()); - - for (size_t i = 0; i < forcedirs.size(); ++i) { - wstring forcedir = forcedirs[i]; - writeLog(L"Forcing dir '" + forcedir + L"'.."); - if (!forcedir.empty() && !CreateDirectory(forcedir.c_str(), NULL)) { - DWORD errorCode = GetLastError(); - if (errorCode && errorCode != ERROR_ALREADY_EXISTS) { - writeLog(L"Error: failed to create dir '" + forcedir + L"'.."); - updateError(L"Failed to create directory", errorCode); - delFolder(); - return false; - } - writeLog(L"Already exists!"); - } - } - - for (size_t i = 0; i < from.size(); ++i) { - wstring fname = from[i], tofname = to[i]; - BOOL copyResult; - do { - writeLog(L"Copying file '" + fname + L"' to '" + tofname + L"'.."); - int copyTries = 0; - do { - copyResult = CopyFile(fname.c_str(), tofname.c_str(), FALSE); - if (!copyResult) { - ++copyTries; - Sleep(100); - } else { - break; - } - } while (copyTries < 100); - if (!copyResult) { - writeLog(L"Error: failed to copy, asking to retry.."); - WCHAR errMsg[2048]; - wsprintf(errMsg, L"Failed to update Telegram :(\n%s is not accessible.", tofname.c_str()); - if (MessageBox(0, errMsg, L"Update error!", MB_ICONERROR | MB_RETRYCANCEL) != IDRETRY) { - delFolder(); - return false; - } - } - } while (!copyResult); - } - - writeLog(L"Update succeed! Clearing folder.."); - delFolder(); - return true; -} - -void updateRegistry() { - if (versionNum && versionNum != 0x7FFFFFFF) { - writeLog(L"Updating registry.."); - versionStr[versionLen / 2] = 0; - HKEY rkey; - LSTATUS status = RegOpenKeyEx(HKEY_CURRENT_USER, L"Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\{53F49750-6209-4FBF-9CA8-7A333C87D1ED}_is1", 0, KEY_QUERY_VALUE | KEY_SET_VALUE, &rkey); - if (status == ERROR_SUCCESS) { - writeLog(L"Checking registry install location.."); - static const int bufSize = 4096; - DWORD locationType, locationSize = bufSize * 2; - WCHAR locationStr[bufSize], exp[bufSize]; - if (RegQueryValueEx(rkey, L"InstallLocation", 0, &locationType, (BYTE*)locationStr, &locationSize) == ERROR_SUCCESS) { - locationSize /= 2; - if (locationStr[locationSize - 1]) { - locationStr[locationSize++] = 0; - } - if (locationType == REG_EXPAND_SZ) { - DWORD copy = ExpandEnvironmentStrings(locationStr, exp, bufSize); - if (copy <= bufSize) { - memcpy(locationStr, exp, copy * sizeof(WCHAR)); - } - } - if (locationType == REG_EXPAND_SZ || locationType == REG_SZ) { - if (PathCanonicalize(exp, locationStr)) { - memcpy(locationStr, exp, bufSize * sizeof(WCHAR)); - if (GetFullPathName(L".", bufSize, exp, 0) < bufSize) { - wstring installpath = locationStr, mypath = exp; - if (installpath == mypath + L"\\" || true) { // always update reg info, if we found it - WCHAR nameStr[bufSize], dateStr[bufSize], publisherStr[bufSize], icongroupStr[bufSize]; - SYSTEMTIME stLocalTime; - GetLocalTime(&stLocalTime); - RegSetValueEx(rkey, L"DisplayVersion", 0, REG_SZ, (BYTE*)versionStr, ((versionLen / 2) + 1) * sizeof(WCHAR)); - wsprintf(nameStr, L"Telegram Desktop version %s", versionStr); - RegSetValueEx(rkey, L"DisplayName", 0, REG_SZ, (BYTE*)nameStr, (wcslen(nameStr) + 1) * sizeof(WCHAR)); - wsprintf(publisherStr, L"Telegram Messenger LLP"); - RegSetValueEx(rkey, L"Publisher", 0, REG_SZ, (BYTE*)publisherStr, (wcslen(publisherStr) + 1) * sizeof(WCHAR)); - wsprintf(icongroupStr, L"Telegram Desktop"); - RegSetValueEx(rkey, L"Inno Setup: Icon Group", 0, REG_SZ, (BYTE*)icongroupStr, (wcslen(icongroupStr) + 1) * sizeof(WCHAR)); - wsprintf(dateStr, L"%04d%02d%02d", stLocalTime.wYear, stLocalTime.wMonth, stLocalTime.wDay); - RegSetValueEx(rkey, L"InstallDate", 0, REG_SZ, (BYTE*)dateStr, (wcslen(dateStr) + 1) * sizeof(WCHAR)); - - WCHAR *appURL = L"https://desktop.telegram.org"; - RegSetValueEx(rkey, L"HelpLink", 0, REG_SZ, (BYTE*)appURL, (wcslen(appURL) + 1) * sizeof(WCHAR)); - RegSetValueEx(rkey, L"URLInfoAbout", 0, REG_SZ, (BYTE*)appURL, (wcslen(appURL) + 1) * sizeof(WCHAR)); - RegSetValueEx(rkey, L"URLUpdateInfo", 0, REG_SZ, (BYTE*)appURL, (wcslen(appURL) + 1) * sizeof(WCHAR)); - } - } - } - } - } - RegCloseKey(rkey); - } - } -} - -int APIENTRY wWinMain(HINSTANCE instance, HINSTANCE prevInstance, LPWSTR cmdParamarg, int cmdShow) { - openLog(); - - _oldWndExceptionFilter = SetUnhandledExceptionFilter(_exceptionFilter); -// CAPIHook apiHook("kernel32.dll", "SetUnhandledExceptionFilter", (PROC)RedirectedSetUnhandledExceptionFilter); - - writeLog(L"Updaters started.."); - - LPWSTR *args; - int argsCount; - - bool needupdate = false, autostart = false, debug = false, writeprotected = false, startintray = false, testmode = false; - args = CommandLineToArgvW(GetCommandLine(), &argsCount); - if (args) { - for (int i = 1; i < argsCount; ++i) { - if (equal(args[i], L"-update")) { - needupdate = true; - } else if (equal(args[i], L"-autostart")) { - autostart = true; - } else if (equal(args[i], L"-debug")) { - debug = _debug = true; - openLog(); - } else if (equal(args[i], L"-startintray")) { - startintray = true; - } else if (equal(args[i], L"-testmode")) { - testmode = true; - } else if (equal(args[i], L"-writeprotected") && ++i < argsCount) { - writeprotected = true; - updateTo = args[i]; - for (int i = 0, l = updateTo.size(); i < l; ++i) { - if (updateTo[i] == L'/') { - updateTo[i] = L'\\'; - } - } - } else if (equal(args[i], L"-exename") && ++i < argsCount) { - exeName = args[i]; - for (int i = 0, l = exeName.size(); i < l; ++i) { - if (exeName[i] == L'/' || exeName[i] == L'\\') { - exeName = L"Telegram.exe"; - break; - } - } - } - } - if (exeName.empty()) { - exeName = L"Telegram.exe"; - } - if (needupdate) writeLog(L"Need to update!"); - if (autostart) writeLog(L"From autostart!"); - if (writeprotected) writeLog(L"Write Protected folder!"); - - updaterName = args[0]; - writeLog(L"Updater name is: " + updaterName); - if (updaterName.size() > 11) { - if (equal(updaterName.substr(updaterName.size() - 11), L"Updater.exe")) { - updaterDir = updaterName.substr(0, updaterName.size() - 11); - writeLog(L"Updater dir is: " + updaterDir); - if (!writeprotected) { - updateTo = updaterDir; - } - writeLog(L"Update to: " + updateTo); - if (needupdate && update()) { - updateRegistry(); - } - if (writeprotected) { // if we can't clear all tupdates\ready (Updater.exe is there) - clear only version - if (DeleteFile(L"tupdates\\temp\\tdata\\version") || DeleteFile(L"tupdates\\ready\\tdata\\version")) { - writeLog(L"Version file deleted!"); - } else { - writeLog(L"Error: could not delete version file"); - } - } - } else { - writeLog(L"Error: bad exe name!"); - } - } else { - writeLog(L"Error: short exe name!"); - } - LocalFree(args); - } else { - writeLog(L"Error: No command line arguments!"); - } - - wstring targs; - if (autostart) targs += L" -autostart"; - if (debug) targs += L" -debug"; - if (startintray) targs += L" -startintray"; - if (testmode) targs += L" -testmode"; - - bool executed = false; - if (writeprotected) { // run un-elevated - writeLog(L"Trying to run un-elevated by temp.lnk"); - - HRESULT hres = CoInitialize(0); - if (SUCCEEDED(hres)) { - IShellLink* psl; - HRESULT hres = CoCreateInstance(CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER, IID_IShellLink, (LPVOID*)&psl); - if (SUCCEEDED(hres)) { - IPersistFile* ppf; - - wstring exe = updateTo + exeName, dir = updateTo; - psl->SetArguments((targs.size() ? targs.substr(1) : targs).c_str()); - psl->SetPath(exe.c_str()); - psl->SetWorkingDirectory(dir.c_str()); - psl->SetDescription(L""); - - hres = psl->QueryInterface(IID_IPersistFile, (LPVOID*)&ppf); - - if (SUCCEEDED(hres)) { - wstring lnk = L"tupdates\\temp\\temp.lnk"; - hres = ppf->Save(lnk.c_str(), TRUE); - if (!SUCCEEDED(hres)) { - lnk = L"tupdates\\ready\\temp.lnk"; // old - hres = ppf->Save(lnk.c_str(), TRUE); - } - ppf->Release(); - - if (SUCCEEDED(hres)) { - writeLog(L"Executing un-elevated through link.."); - ShellExecute(0, 0, L"explorer.exe", lnk.c_str(), 0, SW_SHOWNORMAL); - executed = true; - } else { - writeLog(L"Error: ppf->Save failed"); - } - } else { - writeLog(L"Error: Could not create interface IID_IPersistFile"); - } - psl->Release(); - } else { - writeLog(L"Error: could not create instance of IID_IShellLink"); - } - CoUninitialize(); - } else { - writeLog(L"Error: Could not initialize COM"); - } - } - if (!executed) { - ShellExecute(0, 0, (updateTo + exeName).c_str(), (L"-noupdate" + targs).c_str(), 0, SW_SHOWNORMAL); - } - - writeLog(L"Executed '" + exeName + L"', closing log and quitting.."); - closeLog(); - - return 0; -} - -static const WCHAR *_programName = L"Telegram Desktop"; // folder in APPDATA, if current path is unavailable for writing -static const WCHAR *_exeName = L"Updater.exe"; - -LPTOP_LEVEL_EXCEPTION_FILTER _oldWndExceptionFilter = 0; - -typedef BOOL (FAR STDAPICALLTYPE *t_miniDumpWriteDump)( - _In_ HANDLE hProcess, - _In_ DWORD ProcessId, - _In_ HANDLE hFile, - _In_ MINIDUMP_TYPE DumpType, - _In_opt_ PMINIDUMP_EXCEPTION_INFORMATION ExceptionParam, - _In_opt_ PMINIDUMP_USER_STREAM_INFORMATION UserStreamParam, - _In_opt_ PMINIDUMP_CALLBACK_INFORMATION CallbackParam -); -t_miniDumpWriteDump miniDumpWriteDump = 0; - -HANDLE _generateDumpFileAtPath(const WCHAR *path) { - static const int maxFileLen = MAX_PATH * 10; - - WCHAR szPath[maxFileLen]; - wsprintf(szPath, L"%stdata\\", path); - if (!CreateDirectory(szPath, NULL)) { - if (GetLastError() != ERROR_ALREADY_EXISTS) { - return 0; - } - } - wsprintf(szPath, L"%sdumps\\", path); - if (!CreateDirectory(szPath, NULL)) { - if (GetLastError() != ERROR_ALREADY_EXISTS) { - return 0; - } - } - - WCHAR szFileName[maxFileLen]; - WCHAR szExeName[maxFileLen]; - - wcscpy_s(szExeName, _exeName); - WCHAR *dotFrom = wcschr(szExeName, WCHAR(L'.')); - if (dotFrom) { - wsprintf(dotFrom, L""); - } - - SYSTEMTIME stLocalTime; - - GetLocalTime(&stLocalTime); - - wsprintf(szFileName, L"%s%s-%s-%04d%02d%02d-%02d%02d%02d-%ld-%ld.dmp", - szPath, szExeName, updaterVersionStr, - stLocalTime.wYear, stLocalTime.wMonth, stLocalTime.wDay, - stLocalTime.wHour, stLocalTime.wMinute, stLocalTime.wSecond, - GetCurrentProcessId(), GetCurrentThreadId()); - return CreateFile(szFileName, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_WRITE|FILE_SHARE_READ, 0, CREATE_ALWAYS, 0, 0); -} - -void _generateDump(EXCEPTION_POINTERS* pExceptionPointers) { - static const int maxFileLen = MAX_PATH * 10; - - closeLog(); - - HMODULE hDll = LoadLibrary(L"DBGHELP.DLL"); - if (!hDll) return; - - miniDumpWriteDump = (t_miniDumpWriteDump)GetProcAddress(hDll, "MiniDumpWriteDump"); - if (!miniDumpWriteDump) return; - - HANDLE hDumpFile = 0; - - WCHAR szPath[maxFileLen]; - DWORD len = GetModuleFileName(GetModuleHandle(0), szPath, maxFileLen); - if (!len) return; - - WCHAR *pathEnd = szPath + len; - - if (!_wcsicmp(pathEnd - wcslen(_exeName), _exeName)) { - wsprintf(pathEnd - wcslen(_exeName), L""); - hDumpFile = _generateDumpFileAtPath(szPath); - } - if (!hDumpFile || hDumpFile == INVALID_HANDLE_VALUE) { - WCHAR wstrPath[maxFileLen]; - DWORD wstrPathLen; - if (wstrPathLen = GetEnvironmentVariable(L"APPDATA", wstrPath, maxFileLen)) { - wsprintf(wstrPath + wstrPathLen, L"\\%s\\", _programName); - hDumpFile = _generateDumpFileAtPath(wstrPath); - } - } - - if (!hDumpFile || hDumpFile == INVALID_HANDLE_VALUE) { - return; - } - - MINIDUMP_EXCEPTION_INFORMATION ExpParam = {0}; - ExpParam.ThreadId = GetCurrentThreadId(); - ExpParam.ExceptionPointers = pExceptionPointers; - ExpParam.ClientPointers = TRUE; - - miniDumpWriteDump(GetCurrentProcess(), GetCurrentProcessId(), hDumpFile, MiniDumpWithDataSegs, &ExpParam, NULL, NULL); -} - -LONG CALLBACK _exceptionFilter(EXCEPTION_POINTERS* pExceptionPointers) { - _generateDump(pExceptionPointers); - return _oldWndExceptionFilter ? (*_oldWndExceptionFilter)(pExceptionPointers) : EXCEPTION_CONTINUE_SEARCH; -} - -// see http://www.codeproject.com/Articles/154686/SetUnhandledExceptionFilter-and-the-C-C-Runtime-Li -LPTOP_LEVEL_EXCEPTION_FILTER WINAPI RedirectedSetUnhandledExceptionFilter(_In_opt_ LPTOP_LEVEL_EXCEPTION_FILTER lpTopLevelExceptionFilter) { - // When the CRT calls SetUnhandledExceptionFilter with NULL parameter - // our handler will not get removed. - _oldWndExceptionFilter = lpTopLevelExceptionFilter; - return 0; -} diff --git a/Telegram/SourceFiles/_other/updater.h b/Telegram/SourceFiles/_other/updater.h deleted file mode 100644 index bf28ab672..000000000 --- a/Telegram/SourceFiles/_other/updater.h +++ /dev/null @@ -1,46 +0,0 @@ -/* -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 -#include - -#pragma warning(push) -#pragma warning(disable:4091) -#include -#include -#pragma warning(pop) - -#include -#include - -#include -#include - -using std::deque; -using std::wstring; - -extern LPTOP_LEVEL_EXCEPTION_FILTER _oldWndExceptionFilter; -LONG CALLBACK _exceptionFilter(EXCEPTION_POINTERS* pExceptionPointers); -LPTOP_LEVEL_EXCEPTION_FILTER WINAPI RedirectedSetUnhandledExceptionFilter(_In_opt_ LPTOP_LEVEL_EXCEPTION_FILTER lpTopLevelExceptionFilter); - -static int updaterVersion = 1000; -static const WCHAR *updaterVersionStr = L"0.1.0"; diff --git a/Telegram/SourceFiles/_other/updater_linux.cpp b/Telegram/SourceFiles/_other/updater_linux.cpp deleted file mode 100644 index 2e09dd70d..000000000 --- a/Telegram/SourceFiles/_other/updater_linux.cpp +++ /dev/null @@ -1,476 +0,0 @@ -/* -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 -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -using std::string; -using std::deque; -using std::cout; - -bool do_mkdir(const char *path) { // from http://stackoverflow.com/questions/675039/how-can-i-create-directory-tree-in-c-linux - struct stat statbuf; - if (stat(path, &statbuf) != 0) { - /* Directory does not exist. EEXIST for race condition */ - if (mkdir(path, S_IRWXU) != 0 && errno != EEXIST) return false; - } else if (!S_ISDIR(statbuf.st_mode)) { - errno = ENOTDIR; - return false; - } - - return true; -} - -bool _debug = false; -string updaterDir; -string updaterName; -string workDir; -string exeName; -string exePath; - -FILE *_logFile = 0; -void openLog() { - if (!_debug || _logFile) return; - - if (!do_mkdir((workDir + "DebugLogs").c_str())) { - return; - } - - time_t timer; - - time(&timer); - struct tm *t = localtime(&timer); - - static const int maxFileLen = 65536; - char logName[maxFileLen]; - sprintf(logName, "%sDebugLogs/%04d%02d%02d_%02d%02d%02d_upd.txt", workDir.c_str(), - t->tm_year + 1900, t->tm_mon + 1, t->tm_mday, t->tm_hour, t->tm_min, t->tm_sec); - _logFile = fopen(logName, "w"); -} - -void closeLog() { - if (!_logFile) return; - - fclose(_logFile); - _logFile = 0; -} - -void writeLog(const char *format, ...) { - if (!_logFile) { - return; - } - - va_list args; - va_start(args, format); - vfprintf(_logFile, format, args); - fprintf(_logFile, "\n"); - fflush(_logFile); - va_end(args); -} - -bool copyFile(const char *from, const char *to) { - FILE *ffrom = fopen(from, "rb"), *fto = fopen(to, "wb"); - if (!ffrom) { - if (fto) fclose(fto); - return false; - } - if (!fto) { - fclose(ffrom); - return false; - } - static const int BufSize = 65536; - char buf[BufSize]; - while (size_t size = fread(buf, 1, BufSize, ffrom)) { - fwrite(buf, 1, size, fto); - } - - struct stat fst; // from http://stackoverflow.com/questions/5486774/keeping-fileowner-and-permissions-after-copying-file-in-c - //let's say this wont fail since you already worked OK on that fp - if (fstat(fileno(ffrom), &fst) != 0) { - fclose(ffrom); - fclose(fto); - return false; - } - //update to the same uid/gid - if (fchown(fileno(fto), fst.st_uid, fst.st_gid) != 0) { - fclose(ffrom); - fclose(fto); - return false; - } - //update the permissions - if (fchmod(fileno(fto), fst.st_mode) != 0) { - fclose(ffrom); - fclose(fto); - return false; - } - - fclose(ffrom); - fclose(fto); - - return true; -} - -bool remove_directory(const string &path) { // from http://stackoverflow.com/questions/2256945/removing-a-non-empty-directory-programmatically-in-c-or-c - DIR *d = opendir(path.c_str()); - writeLog("Removing dir '%s'", path.c_str()); - - if (!d) { - writeLog("Could not open dir '%s'", path.c_str()); - return (errno == ENOENT); - } - - while (struct dirent *p = readdir(d)) { - /* Skip the names "." and ".." as we don't want to recurse on them. */ - if (!strcmp(p->d_name, ".") || !strcmp(p->d_name, "..")) continue; - - string fname = path + '/' + p->d_name; - struct stat statbuf; - writeLog("Trying to get stat() for '%s'", fname.c_str()); - if (!stat(fname.c_str(), &statbuf)) { - if (S_ISDIR(statbuf.st_mode)) { - if (!remove_directory(fname.c_str())) { - closedir(d); - return false; - } - } else { - writeLog("Unlinking file '%s'", fname.c_str()); - if (unlink(fname.c_str())) { - writeLog("Failed to unlink '%s'", fname.c_str()); - closedir(d); - return false; - } - } - } else { - writeLog("Failed to call stat() on '%s'", fname.c_str()); - } - } - closedir(d); - - writeLog("Finally removing dir '%s'", path.c_str()); - return !rmdir(path.c_str()); -} - -bool mkpath(const char *path) { - int status = 0, pathsize = strlen(path) + 1; - char *copypath = new char[pathsize]; - memcpy(copypath, path, pathsize); - - char *pp = copypath, *sp; - while (status == 0 && (sp = strchr(pp, '/')) != 0) { - if (sp != pp) { - /* Neither root nor double slash in path */ - *sp = '\0'; - if (!do_mkdir(copypath)) { - delete[] copypath; - return false; - } - *sp = '/'; - } - pp = sp + 1; - } - delete[] copypath; - return do_mkdir(path); -} - -bool equal(string a, string b) { - std::transform(a.begin(), a.end(), a.begin(), ::tolower); - std::transform(b.begin(), b.end(), b.begin(), ::tolower); - return a == b; -} - -void delFolder() { - string delPathOld = workDir + "tupdates/ready", delPath = workDir + "tupdates/temp", delFolder = workDir + "tupdates"; - writeLog("Fully clearing old path '%s'..", delPathOld.c_str()); - if (!remove_directory(delPathOld)) { - writeLog("Failed to clear old path! :( New path was used?.."); - } - writeLog("Fully clearing path '%s'..", delPath.c_str()); - if (!remove_directory(delPath)) { - writeLog("Error: failed to clear path! :("); - } - rmdir(delFolder.c_str()); -} - -bool update() { - writeLog("Update started.."); - - string updDir = workDir + "tupdates/temp", readyFilePath = workDir + "tupdates/temp/ready", tdataDir = workDir + "tupdates/temp/tdata"; - { - FILE *readyFile = fopen(readyFilePath.c_str(), "rb"); - if (readyFile) { - fclose(readyFile); - writeLog("Ready file found! Using new path '%s'..", updDir.c_str()); - } else { - updDir = workDir + "tupdates/ready"; // old - tdataDir = workDir + "tupdates/ready/tdata"; - writeLog("Ready file not found! Using old path '%s'..", updDir.c_str()); - } - } - - deque dirs; - dirs.push_back(updDir); - - deque from, to, forcedirs; - - do { - string dir = dirs.front(); - dirs.pop_front(); - - string toDir = exePath; - if (dir.size() > updDir.size() + 1) { - toDir += (dir.substr(updDir.size() + 1) + '/'); - forcedirs.push_back(toDir); - writeLog("Parsing dir '%s' in update tree..", toDir.c_str()); - } - - DIR *d = opendir(dir.c_str()); - if (!d) { - writeLog("Failed to open dir %s", dir.c_str()); - return false; - } - - while (struct dirent *p = readdir(d)) { - /* Skip the names "." and ".." as we don't want to recurse on them. */ - if (!strcmp(p->d_name, ".") || !strcmp(p->d_name, "..")) continue; - - string fname = dir + '/' + p->d_name; - struct stat statbuf; - if (fname.substr(0, tdataDir.size()) == tdataDir && (fname.size() <= tdataDir.size() || fname.at(tdataDir.size()) == '/')) { - writeLog("Skipping 'tdata' path '%s'", fname.c_str()); - } else if (!stat(fname.c_str(), &statbuf)) { - if (S_ISDIR(statbuf.st_mode)) { - dirs.push_back(fname); - writeLog("Added dir '%s' in update tree..", fname.c_str()); - } else { - string tofname = exePath + fname.substr(updDir.size() + 1); - if (equal(tofname, updaterName)) { // bad update - has Updater - delete all dir - writeLog("Error: bad update, has Updater! '%s' equal '%s'", tofname.c_str(), updaterName.c_str()); - delFolder(); - return false; - } else if (equal(tofname, exePath + "Telegram") && exeName != "Telegram") { - string fullBinaryPath = exePath + exeName; - writeLog("Target binary found: '%s', changing to '%s'", tofname.c_str(), fullBinaryPath.c_str()); - tofname = fullBinaryPath; - } - if (fname == readyFilePath) { - writeLog("Skipped ready file '%s'", fname.c_str()); - } else { - from.push_back(fname); - to.push_back(tofname); - writeLog("Added file '%s' to be copied to '%s'", fname.c_str(), tofname.c_str()); - } - } - } else { - writeLog("Could not get stat() for file %s", fname.c_str()); - } - } - closedir(d); - } while (!dirs.empty()); - - for (size_t i = 0; i < forcedirs.size(); ++i) { - string forcedir = forcedirs[i]; - writeLog("Forcing dir '%s'..", forcedir.c_str()); - if (!forcedir.empty() && !mkpath(forcedir.c_str())) { - writeLog("Error: failed to create dir '%s'..", forcedir.c_str()); - delFolder(); - return false; - } - } - - for (size_t i = 0; i < from.size(); ++i) { - string fname = from[i], tofname = to[i]; - writeLog("Copying file '%s' to '%s'..", fname.c_str(), tofname.c_str()); - int copyTries = 0, triesLimit = 30; - do { - if (!copyFile(fname.c_str(), tofname.c_str())) { - ++copyTries; - usleep(100000); - } else { - break; - } - } while (copyTries < triesLimit); - if (copyTries == triesLimit) { - writeLog("Error: failed to copy, asking to retry.."); - delFolder(); - return false; - } - } - - writeLog("Update succeed! Clearing folder.."); - delFolder(); - return true; -} - -string CurrentExecutablePath(int argc, char *argv[]) { - constexpr auto kMaxPath = 1024; - char result[kMaxPath] = { 0 }; - auto count = readlink("/proc/self/exe", result, kMaxPath); - if (count > 0) { - return string(result); - } - - // Fallback to the first command line argument. - return argc ? string(argv[0]) : string(); -} - -int main(int argc, char *argv[]) { - bool needupdate = true, autostart = false, debug = false, tosettings = false, startintray = false, testmode = false; - - char *key = 0, *crashreport = 0; - for (int i = 1; i < argc; ++i) { - if (equal(argv[i], "-noupdate")) { - needupdate = false; - } else if (equal(argv[i], "-autostart")) { - autostart = true; - } else if (equal(argv[i], "-debug")) { - debug = _debug = true; - } else if (equal(argv[i], "-startintray")) { - startintray = true; - } else if (equal(argv[i], "-testmode")) { - testmode = true; - } else if (equal(argv[i], "-tosettings")) { - tosettings = true; - } else if (equal(argv[i], "-key") && ++i < argc) { - key = argv[i]; - } else if (equal(argv[i], "-workpath") && ++i < argc) { - workDir = argv[i]; - } else if (equal(argv[i], "-crashreport") && ++i < argc) { - crashreport = argv[i]; - } else if (equal(argv[i], "-exename") && ++i < argc) { - exeName = argv[i]; - } else if (equal(argv[i], "-exepath") && ++i < argc) { - exePath = argv[i]; - } - } - if (exeName.empty() || exeName.find('/') != string::npos) { - exeName = "Telegram"; - } - openLog(); - - writeLog("Updater started.."); - for (int i = 0; i < argc; ++i) { - writeLog("Argument: '%s'", argv[i]); - } - if (needupdate) writeLog("Need to update!"); - if (autostart) writeLog("From autostart!"); - - updaterName = CurrentExecutablePath(argc, argv); - writeLog("Updater binary full path is: %s", updaterName.c_str()); - if (exePath.empty()) { - writeLog("Executable path is not specified :("); - } else { - writeLog("Executable path: %s", exePath.c_str()); - } - if (updaterName.size() >= 7) { - if (equal(updaterName.substr(updaterName.size() - 7), "Updater")) { - updaterDir = updaterName.substr(0, updaterName.size() - 7); - writeLog("Updater binary dir is: %s", updaterDir.c_str()); - if (exePath.empty()) { - exePath = updaterDir; - writeLog("Using updater binary dir.", exePath.c_str()); - } - if (needupdate) { - if (workDir.empty()) { // old app launched, update prepared in tupdates/ready (not in tupdates/temp) - writeLog("No workdir, trying to figure it out"); - struct passwd *pw = getpwuid(getuid()); - if (pw && pw->pw_dir && strlen(pw->pw_dir)) { - string tryDir = pw->pw_dir + string("/.TelegramDesktop/"); - struct stat statbuf; - writeLog("Trying to use '%s' as workDir, getting stat() for tupdates/ready", tryDir.c_str()); - if (!stat((tryDir + "tupdates/ready").c_str(), &statbuf)) { - writeLog("Stat got"); - if (S_ISDIR(statbuf.st_mode)) { - writeLog("It is directory, using home work dir"); - workDir = tryDir; - } - } - } - if (workDir.empty()) { - workDir = exePath; - - struct stat statbuf; - writeLog("Trying to use current as workDir, getting stat() for tupdates/ready"); - if (!stat("tupdates/ready", &statbuf)) { - writeLog("Stat got"); - if (S_ISDIR(statbuf.st_mode)) { - writeLog("It is directory, using current dir"); - workDir = string(); - } - } - } - } else { - writeLog("Passed workpath is '%s'", workDir.c_str()); - } - update(); - } - } else { - writeLog("Error: bad exe name!"); - } - } else { - writeLog("Error: short exe name!"); - } - - static const int MaxLen = 65536, MaxArgsCount = 128; - - char path[MaxLen] = {0}; - string fullBinaryPath = exePath + exeName; - strcpy(path, fullBinaryPath.c_str()); - - char *args[MaxArgsCount] = {0}, p_noupdate[] = "-noupdate", p_autostart[] = "-autostart", p_debug[] = "-debug", p_tosettings[] = "-tosettings", p_key[] = "-key", p_startintray[] = "-startintray", p_testmode[] = "-testmode"; - int argIndex = 0; - args[argIndex++] = path; - if (crashreport) { - args[argIndex++] = crashreport; - } else { - args[argIndex++] = p_noupdate; - if (autostart) args[argIndex++] = p_autostart; - if (debug) args[argIndex++] = p_debug; - if (startintray) args[argIndex++] = p_startintray; - if (testmode) args[argIndex++] = p_testmode; - if (tosettings) args[argIndex++] = p_tosettings; - if (key) { - args[argIndex++] = p_key; - args[argIndex++] = key; - } - } - pid_t pid = fork(); - switch (pid) { - case -1: writeLog("fork() failed!"); return 1; - case 0: execv(path, args); return 1; - } - - writeLog("Executed Telegram, closing log and quitting.."); - closeLog(); - - return 0; -} diff --git a/Telegram/SourceFiles/_other/updater_osx.m b/Telegram/SourceFiles/_other/updater_osx.m deleted file mode 100644 index b2b9d0b03..000000000 --- a/Telegram/SourceFiles/_other/updater_osx.m +++ /dev/null @@ -1,272 +0,0 @@ -/* -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 -*/ -#import - -NSString *appName = @"Telegram.app"; -NSString *appDir = nil; -NSString *workDir = nil; -NSString *crashReportArg = nil; - -#ifdef _DEBUG -BOOL _debug = YES; -#else -BOOL _debug = NO; -#endif - -NSFileHandle *_logFile = nil; -void openLog() { - if (!_debug || _logFile) return; - NSString *logDir = [workDir stringByAppendingString:@"DebugLogs"]; - if (![[NSFileManager defaultManager] createDirectoryAtPath:logDir withIntermediateDirectories:YES attributes:nil error:nil]) { - return; - } - - NSDateFormatter *fmt = [[NSDateFormatter alloc] initWithDateFormat:@"DebugLogs/%Y%m%d_%H%M%S_upd.txt" allowNaturalLanguage:NO]; - NSString *logPath = [workDir stringByAppendingString:[fmt stringFromDate:[NSDate date]]]; - [[NSFileManager defaultManager] createFileAtPath:logPath contents:nil attributes:nil]; - _logFile = [NSFileHandle fileHandleForWritingAtPath:logPath]; -} - -void closeLog() { - if (!_logFile) return; - - [_logFile closeFile]; -} - -void writeLog(NSString *msg) { - if (!_logFile) return; - - [_logFile writeData:[[msg stringByAppendingString:@"\n"] dataUsingEncoding:NSUTF8StringEncoding]]; - [_logFile synchronizeFile]; -} - -void delFolder() { - writeLog([@"Fully clearing old path: " stringByAppendingString:[workDir stringByAppendingString:@"tupdates/ready"]]); - if (![[NSFileManager defaultManager] removeItemAtPath:[workDir stringByAppendingString:@"tupdates/ready"] error:nil]) { - writeLog(@"Failed to clear old path! :( New path was used?.."); - } - writeLog([@"Fully clearing new path: " stringByAppendingString:[workDir stringByAppendingString:@"tupdates/temp"]]); - if (![[NSFileManager defaultManager] removeItemAtPath:[workDir stringByAppendingString:@"tupdates/temp"] error:nil]) { - writeLog(@"Error: failed to clear new path! :("); - } - rmdir([[workDir stringByAppendingString:@"tupdates"] fileSystemRepresentation]); -} - -int main(int argc, const char * argv[]) { - NSString *path = [[NSBundle mainBundle] bundlePath]; - if (!path) { - return -1; - } - NSRange range = [path rangeOfString:@".app/" options:NSBackwardsSearch]; - if (range.location == NSNotFound) { - return -1; - } - path = [path substringToIndex:range.location > 0 ? range.location : 0]; - - range = [path rangeOfString:@"/" options:NSBackwardsSearch]; - NSString *appRealName = (range.location == NSNotFound) ? path : [path substringFromIndex:range.location + 1]; - appRealName = [[NSArray arrayWithObjects:appRealName, @".app", nil] componentsJoinedByString:@""]; - appDir = (range.location == NSNotFound) ? @"" : [path substringToIndex:range.location + 1]; - NSString *appDirFull = [appDir stringByAppendingString:appRealName]; - - openLog(); - pid_t procId = 0; - BOOL update = YES, toSettings = NO, autoStart = NO, startInTray = NO, testMode = NO; - NSString *key = nil; - for (int i = 0; i < argc; ++i) { - if ([@"-workpath" isEqualToString:[NSString stringWithUTF8String:argv[i]]]) { - if (++i < argc) { - workDir = [NSString stringWithUTF8String:argv[i]]; - } - } else if ([@"-procid" isEqualToString:[NSString stringWithUTF8String:argv[i]]]) { - if (++i < argc) { - NSNumberFormatter *formatter = [[NSNumberFormatter alloc] init]; - [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]]]) { - toSettings = YES; - } else if ([@"-autostart" isEqualToString:[NSString stringWithUTF8String:argv[i]]]) { - autoStart = YES; - } else if ([@"-debug" isEqualToString:[NSString stringWithUTF8String:argv[i]]]) { - _debug = YES; - } else if ([@"-startintray" isEqualToString:[NSString stringWithUTF8String:argv[i]]]) { - startInTray = YES; - } else if ([@"-testmode" isEqualToString:[NSString stringWithUTF8String:argv[i]]]) { - testMode = YES; - } else if ([@"-key" isEqualToString:[NSString stringWithUTF8String:argv[i]]]) { - if (++i < argc) key = [NSString stringWithUTF8String:argv[i]]; - } - } - if (!workDir) workDir = appDir; - openLog(); - NSMutableArray *argsArr = [[NSMutableArray alloc] initWithCapacity:argc]; - for (int i = 0; i < argc; ++i) { - [argsArr addObject:[NSString stringWithUTF8String:argv[i]]]; - } - writeLog([[NSArray arrayWithObjects:@"Arguments: '", [argsArr componentsJoinedByString:@"' '"], @"'..", nil] componentsJoinedByString:@""]); - if (key) writeLog([@"Key: " stringByAppendingString:key]); - if (toSettings) writeLog(@"To Settings!"); - - if (procId) { - NSRunningApplication *app = [NSRunningApplication runningApplicationWithProcessIdentifier:procId]; - for (int i = 0; i < 5 && app != nil && ![app isTerminated]; ++i) { - usleep(200000); - app = [NSRunningApplication runningApplicationWithProcessIdentifier:procId]; - } - if (app) [app forceTerminate]; - app = [NSRunningApplication runningApplicationWithProcessIdentifier:procId]; - for (int i = 0; i < 5 && app != nil && ![app isTerminated]; ++i) { - usleep(200000); - app = [NSRunningApplication runningApplicationWithProcessIdentifier:procId]; - } - } - - if (update) { - NSFileManager *fileManager = [NSFileManager defaultManager]; - NSString *readyFilePath = [workDir stringByAppendingString:@"tupdates/temp/ready"]; - NSString *srcDir = [workDir stringByAppendingString:@"tupdates/temp/"], *srcEnum = [workDir stringByAppendingString:@"tupdates/temp"]; - if ([fileManager fileExistsAtPath:readyFilePath]) { - writeLog([@"Ready file found! Using new path: " stringByAppendingString: srcEnum]); - } else { - srcDir = [workDir stringByAppendingString:@"tupdates/ready/"]; // old - srcEnum = [workDir stringByAppendingString:@"tupdates/ready"]; - writeLog([@"Ready file not found! Using old path: " stringByAppendingString: srcEnum]); - } - - writeLog([@"Starting update files iteration, path: " stringByAppendingString: srcEnum]); - - // Take the Updater (this currently running binary) from the place where it was placed by Telegram - // and copy it to the folder with the new version of the app (ready), - // so it won't be deleted when we will clear the "Telegram.app/Contents" folder. - NSString *oldVersionUpdaterPath = [appDirFull stringByAppendingString: @"/Contents/Frameworks/Updater" ]; - NSString *newVersionUpdaterPath = [srcEnum stringByAppendingString:[[NSArray arrayWithObjects:@"/", appName, @"/Contents/Frameworks/Updater", nil] componentsJoinedByString:@""]]; - writeLog([[NSArray arrayWithObjects: @"Copying Updater from old path ", oldVersionUpdaterPath, @" to new path ", newVersionUpdaterPath, nil] componentsJoinedByString:@""]); - if (![fileManager fileExistsAtPath:newVersionUpdaterPath]) { - if (![fileManager copyItemAtPath:oldVersionUpdaterPath toPath:newVersionUpdaterPath error:nil]) { - writeLog([[NSArray arrayWithObjects: @"Failed to copy file from ", oldVersionUpdaterPath, @" to ", newVersionUpdaterPath, nil] componentsJoinedByString:@""]); - delFolder(); - return -1; - } - } - - - NSString *contentsPath = [appDirFull stringByAppendingString: @"/Contents"]; - writeLog([[NSArray arrayWithObjects: @"Clearing dir ", contentsPath, nil] componentsJoinedByString:@""]); - if (![fileManager removeItemAtPath:contentsPath error:nil]) { - writeLog([@"Failed to clear path for directory " stringByAppendingString:contentsPath]); - delFolder(); - return -1; - } - - NSArray *keys = [NSArray arrayWithObject:NSURLIsDirectoryKey]; - NSDirectoryEnumerator *enumerator = [fileManager - enumeratorAtURL:[NSURL fileURLWithPath:srcEnum] - includingPropertiesForKeys:keys - options:0 - errorHandler:^(NSURL *url, NSError *error) { - writeLog([[[@"Error in enumerating " stringByAppendingString:[url absoluteString]] stringByAppendingString: @" error is: "] stringByAppendingString: [error description]]); - return NO; - }]; - for (NSURL *url in enumerator) { - NSString *srcPath = [url path]; - writeLog([@"Handling file " stringByAppendingString:srcPath]); - NSRange r = [srcPath rangeOfString:srcDir]; - if (r.location != 0) { - writeLog([@"Bad file found, no base path " stringByAppendingString:srcPath]); - delFolder(); - break; - } - NSString *pathPart = [srcPath substringFromIndex:r.length]; - r = [pathPart rangeOfString:appName]; - if (r.location != 0) { - writeLog([@"Skipping not app file " stringByAppendingString:srcPath]); - continue; - } - NSString *dstPath = [appDirFull stringByAppendingString:[pathPart substringFromIndex:r.length]]; - NSError *error; - NSNumber *isDirectory = nil; - if (![url getResourceValue:&isDirectory forKey:NSURLIsDirectoryKey error:&error]) { - writeLog([@"Failed to get IsDirectory for file " stringByAppendingString:[url path]]); - delFolder(); - break; - } - if ([isDirectory boolValue]) { - writeLog([[NSArray arrayWithObjects: @"Copying dir ", srcPath, @" to ", dstPath, nil] componentsJoinedByString:@""]); - if (![fileManager createDirectoryAtPath:dstPath withIntermediateDirectories:YES attributes:nil error:nil]) { - writeLog([@"Failed to force path for directory " stringByAppendingString:dstPath]); - delFolder(); - break; - } - } else if ([srcPath isEqualToString:readyFilePath]) { - writeLog([[NSArray arrayWithObjects: @"Skipping ready file ", srcPath, nil] componentsJoinedByString:@""]); - } else if ([fileManager fileExistsAtPath:dstPath]) { - if (![[NSData dataWithContentsOfFile:srcPath] writeToFile:dstPath atomically:YES]) { - writeLog([@"Failed to edit file " stringByAppendingString:dstPath]); - delFolder(); - break; - } - } else { - if (![fileManager copyItemAtPath:srcPath toPath:dstPath error:nil]) { - writeLog([@"Failed to copy file to " stringByAppendingString:dstPath]); - delFolder(); - break; - } - } - } - delFolder(); - } - - NSString *appPath = [[NSArray arrayWithObjects:appDir, appRealName, nil] componentsJoinedByString:@""]; - 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; - NSRunningApplication *result = [[NSWorkspace sharedWorkspace] - launchApplicationAtURL:[NSURL fileURLWithPath:appPath] - options:NSWorkspaceLaunchDefault - configuration:[NSDictionary - dictionaryWithObject:args - forKey:NSWorkspaceLaunchConfigurationArguments] - error:&error]; - if (!result) { - writeLog([@"Could not run application, error: " stringByAppendingString:error ? [error localizedDescription] : @"(nil)"]); - } - closeLog(); - return result ? 0 : -1; -} - diff --git a/Telegram/SourceFiles/app.cpp b/Telegram/SourceFiles/app.cpp index d9bf8a5a6..f66e7eb61 100644 --- a/Telegram/SourceFiles/app.cpp +++ b/Telegram/SourceFiles/app.cpp @@ -2393,17 +2393,8 @@ namespace { } void restart() { -#ifndef TDESKTOP_DISABLE_AUTOUPDATE - bool updateReady = (Sandbox::updatingState() == Application::UpdatingReady); -#else // !TDESKTOP_DISABLE_AUTOUPDATE - bool updateReady = false; -#endif // else for !TDESKTOP_DISABLE_AUTOUPDATE - if (updateReady) { - cSetRestartingUpdate(true); - } else { - cSetRestarting(true); - cSetRestartingToSettings(true); - } + cSetRestarting(true); + cSetRestartingToSettings(true); App::quit(); } diff --git a/Telegram/SourceFiles/application.cpp b/Telegram/SourceFiles/application.cpp index f0473b976..0851cc946 100644 --- a/Telegram/SourceFiles/application.cpp +++ b/Telegram/SourceFiles/application.cpp @@ -24,7 +24,6 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "mainwidget.h" #include "mainwindow.h" #include "storage/localstorage.h" -#include "autoupdater.h" #include "window/notifications_manager.h" #include "messenger.h" #include "base/timer.h" @@ -92,13 +91,6 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv) { QTimer::singleShot(0, this, SLOT(startApplication())); connect(this, SIGNAL(aboutToQuit()), this, SLOT(closeApplication())); -#ifndef TDESKTOP_DISABLE_AUTOUPDATE - _updateCheckTimer.create(this); - connect(_updateCheckTimer, SIGNAL(timeout()), this, SLOT(updateCheck())); - connect(this, SIGNAL(updateFailed()), this, SLOT(onUpdateFailed())); - connect(this, SIGNAL(updateReady()), this, SLOT(onUpdateReady())); -#endif // !TDESKTOP_DISABLE_AUTOUPDATE - if (cManyInstance()) { LOG(("Many instance allowed, starting...")); singleInstanceChecked(); @@ -185,14 +177,6 @@ void Application::socketError(QLocalSocket::LocalSocketError e) { } #endif // !Q_OS_WINRT -#ifndef TDESKTOP_DISABLE_AUTOUPDATE - if (!cNoStartUpdate() && checkReadyUpdate()) { - cSetRestartingUpdate(true); - DEBUG_LOG(("Application Info: installing update instead of starting app...")); - return App::quit(); - } -#endif // !TDESKTOP_DISABLE_AUTOUPDATE - singleInstanceChecked(); } @@ -332,171 +316,8 @@ void Application::closeApplication() { _localClients.clear(); _localSocket.close(); - -#ifndef TDESKTOP_DISABLE_AUTOUPDATE - delete _updateReply; - _updateReply = 0; - if (_updateChecker) _updateChecker->deleteLater(); - _updateChecker = 0; - if (_updateThread) { - _updateThread->quit(); - } - _updateThread = 0; -#endif // !TDESKTOP_DISABLE_AUTOUPDATE } -#ifndef TDESKTOP_DISABLE_AUTOUPDATE -void Application::updateCheck() { - startUpdateCheck(false); -} - -void Application::updateGotCurrent() { - if (!_updateReply || _updateThread) return; - - cSetLastUpdateCheck(unixtime()); - QRegularExpressionMatch m = QRegularExpression(qsl("^\\s*(\\d+)\\s*:\\s*([\\x21-\\x7f]+)\\s*$")).match(QString::fromLatin1(_updateReply->readAll())); - if (m.hasMatch()) { - quint64 currentVersion = m.captured(1).toULongLong(); - QString url = m.captured(2); - bool betaVersion = false; - if (url.startsWith(qstr("beta_"))) { - betaVersion = true; - url = url.mid(5) + '_' + countBetaVersionSignature(currentVersion); - } - if ((!betaVersion || cBetaVersion()) && currentVersion > (betaVersion ? cBetaVersion() : quint64(AppVersion))) { - _updateThread = new QThread(); - connect(_updateThread, SIGNAL(finished()), _updateThread, SLOT(deleteLater())); - _updateChecker = new UpdateChecker(_updateThread, url); - _updateThread->start(); - } - } - if (_updateReply) _updateReply->deleteLater(); - _updateReply = 0; - if (!_updateThread) { - QDir updates(cWorkingDir() + "tupdates"); - if (updates.exists()) { - QFileInfoList list = updates.entryInfoList(QDir::Files); - for (QFileInfoList::iterator i = list.begin(), e = list.end(); i != e; ++i) { - if (QRegularExpression("^(tupdate|tmacupd|tmac32upd|tlinuxupd|tlinux32upd)\\d+(_[a-z\\d]+)?$", QRegularExpression::CaseInsensitiveOption).match(i->fileName()).hasMatch()) { - QFile(i->absoluteFilePath()).remove(); - } - } - } - emit updateLatest(); - } - startUpdateCheck(true); - Local::writeSettings(); -} - -void Application::updateFailedCurrent(QNetworkReply::NetworkError e) { - LOG(("App Error: could not get current version (update check): %1").arg(e)); - if (_updateReply) _updateReply->deleteLater(); - _updateReply = 0; - - emit updateFailed(); - startUpdateCheck(true); -} - -void Application::onUpdateReady() { - if (_updateChecker) { - _updateChecker->deleteLater(); - _updateChecker = nullptr; - } - _updateCheckTimer->stop(); - - cSetLastUpdateCheck(unixtime()); - Local::writeSettings(); -} - -void Application::onUpdateFailed() { - if (_updateChecker) { - _updateChecker->deleteLater(); - _updateChecker = 0; - if (_updateThread) _updateThread->quit(); - _updateThread = 0; - } - - cSetLastUpdateCheck(unixtime()); - Local::writeSettings(); -} - -Application::UpdatingState Application::updatingState() { - if (!_updateThread) return Application::UpdatingNone; - if (!_updateChecker) return Application::UpdatingReady; - return Application::UpdatingDownload; -} - -qint32 Application::updatingSize() { - if (!_updateChecker) return 0; - return _updateChecker->size(); -} - -qint32 Application::updatingReady() { - if (!_updateChecker) return 0; - return _updateChecker->ready(); -} - -void Application::stopUpdate() { - if (_updateReply) { - _updateReply->abort(); - _updateReply->deleteLater(); - _updateReply = 0; - } - if (_updateChecker) { - _updateChecker->deleteLater(); - _updateChecker = 0; - if (_updateThread) _updateThread->quit(); - _updateThread = 0; - } -} - -void Application::startUpdateCheck(bool forceWait) { - if (!Sandbox::started()) return; - - _updateCheckTimer->stop(); - if (_updateThread || _updateReply || !cAutoUpdate() || cExeName().isEmpty()) return; - - qint32 constDelay = cBetaVersion() ? 600 : UpdateDelayConstPart, randDelay = cBetaVersion() ? 300 : UpdateDelayRandPart; - qint32 updateInSecs = cLastUpdateCheck() + constDelay + qint32(rand() % randDelay) - unixtime(); - bool sendRequest = (updateInSecs <= 0 || updateInSecs > (constDelay + randDelay)); - if (!sendRequest && !forceWait) { - QDir updates(cWorkingDir() + "tupdates"); - if (updates.exists()) { - QFileInfoList list = updates.entryInfoList(QDir::Files); - for (QFileInfoList::iterator i = list.begin(), e = list.end(); i != e; ++i) { - if (QRegularExpression("^(tupdate|tmacupd|tmac32upd|tlinuxupd|tlinux32upd)\\d+(_[a-z\\d]+)?$", QRegularExpression::CaseInsensitiveOption).match(i->fileName()).hasMatch()) { - sendRequest = true; - } - } - } - } - if (cManyInstance() && !cDebug()) return; // only main instance is updating - - if (sendRequest) { - QUrl url(cUpdateURL()); - if (cBetaVersion()) { - url.setQuery(qsl("version=%1&beta=%2").arg(AppVersion).arg(cBetaVersion())); - } else if (cAlphaVersion()) { - url.setQuery(qsl("version=%1&alpha=1").arg(AppVersion)); - } else { - url.setQuery(qsl("version=%1").arg(AppVersion)); - } - QString u = url.toString(); - QNetworkRequest checkVersion(url); - if (_updateReply) _updateReply->deleteLater(); - - App::setProxySettings(_updateManager); - _updateReply = _updateManager.get(checkVersion); - connect(_updateReply, SIGNAL(finished()), this, SLOT(updateGotCurrent())); - connect(_updateReply, SIGNAL(error(QNetworkReply::NetworkError)), this, SLOT(updateFailedCurrent(QNetworkReply::NetworkError))); - emit updateChecking(); - } else { - _updateCheckTimer->start((updateInSecs + 5) * 1000); - } -} - -#endif // !TDESKTOP_DISABLE_AUTOUPDATE - inline Application *application() { return qobject_cast(QApplication::instance()); } @@ -548,73 +369,6 @@ void adjustSingleTimers() { base::Timer::Adjust(); } -#ifndef TDESKTOP_DISABLE_AUTOUPDATE - -void startUpdateCheck() { - if (auto a = application()) { - return a->startUpdateCheck(false); - } -} - -void stopUpdate() { - if (auto a = application()) { - return a->stopUpdate(); - } -} - -Application::UpdatingState updatingState() { - if (auto a = application()) { - return a->updatingState(); - } - return Application::UpdatingNone; -} - -qint32 updatingSize() { - if (auto a = application()) { - return a->updatingSize(); - } - return 0; -} - -qint32 updatingReady() { - if (auto a = application()) { - return a->updatingReady(); - } - return 0; -} - -void updateChecking() { - if (auto a = application()) { - emit a->updateChecking(); - } -} - -void updateLatest() { - if (auto a = application()) { - emit a->updateLatest(); - } -} - -void updateProgress(qint64 ready, qint64 total) { - if (auto a = application()) { - emit a->updateProgress(ready, total); - } -} - -void updateFailed() { - if (auto a = application()) { - emit a->updateFailed(); - } -} - -void updateReady() { - if (auto a = application()) { - emit a->updateReady(); - } -} - -#endif // !TDESKTOP_DISABLE_AUTOUPDATE - void connect(const char *signal, QObject *object, const char *method) { if (auto a = application()) { a->connect(a, signal, object, method); diff --git a/Telegram/SourceFiles/application.h b/Telegram/SourceFiles/application.h index 6f5d7f430..f4e45024e 100644 --- a/Telegram/SourceFiles/application.h +++ b/Telegram/SourceFiles/application.h @@ -23,7 +23,6 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "stdafx.h" #include -class UpdateChecker; class Application : public QApplication { Q_OBJECT @@ -67,47 +66,6 @@ private: bool _secondInstance = false; void singleInstanceChecked(); - -#ifndef TDESKTOP_DISABLE_AUTOUPDATE - -// Autoupdating -public: - void startUpdateCheck(bool forceWait); - void stopUpdate(); - - enum UpdatingState { - UpdatingNone, - UpdatingDownload, - UpdatingReady, - }; - UpdatingState updatingState(); - qint32 updatingSize(); - qint32 updatingReady(); - -signals: - void updateChecking(); - void updateLatest(); - void updateProgress(qint64 ready, qint64 total); - void updateReady(); - void updateFailed(); - -public slots: - void updateCheck(); - - void updateGotCurrent(); - void updateFailedCurrent(QNetworkReply::NetworkError e); - - void onUpdateReady(); - void onUpdateFailed(); - -private: - object_ptr _updateCheckTimer = { nullptr }; - QNetworkReply *_updateReply = nullptr; - QNetworkAccessManager _updateManager; - QThread *_updateThread = nullptr; - UpdateChecker *_updateChecker = nullptr; - -#endif // !TDESKTOP_DISABLE_AUTOUPDATE }; namespace Sandbox { @@ -121,23 +79,6 @@ void execExternal(const QString &cmd); void adjustSingleTimers(); -#ifndef TDESKTOP_DISABLE_AUTOUPDATE - -void startUpdateCheck(); -void stopUpdate(); - -Application::UpdatingState updatingState(); -qint32 updatingSize(); -qint32 updatingReady(); - -void updateChecking(); -void updateLatest(); -void updateProgress(qint64 ready, qint64 total); -void updateFailed(); -void updateReady(); - -#endif // !TDESKTOP_DISABLE_AUTOUPDATE - void connect(const char *signal, QObject *object, const char *method); void launch(); diff --git a/Telegram/SourceFiles/autoupdater.cpp b/Telegram/SourceFiles/autoupdater.cpp deleted file mode 100644 index a6aa4c296..000000000 --- a/Telegram/SourceFiles/autoupdater.cpp +++ /dev/null @@ -1,627 +0,0 @@ -/* -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 "autoupdater.h" - -#include -#include -#include -#include - -#ifdef Q_OS_WIN // use Lzma SDK for win -#include -#else // Q_OS_WIN -#include -#endif // else of Q_OS_WIN - -#include "application.h" -#include "platform/platform_specific.h" - -#ifndef TDESKTOP_DISABLE_AUTOUPDATE - -#ifdef Q_OS_WIN -typedef DWORD VerInt; -typedef WCHAR VerChar; -#else // Q_OS_WIN -typedef int VerInt; -typedef wchar_t VerChar; -#endif // Q_OS_WIN - -UpdateChecker::UpdateChecker(QThread *thread, const QString &url) : reply(0), already(0), full(0) { - updateUrl = url; - moveToThread(thread); - manager.moveToThread(thread); - App::setProxySettings(manager); - - connect(thread, SIGNAL(started()), this, SLOT(start())); - initOutput(); -} - -void UpdateChecker::initOutput() { - QString fileName; - QRegularExpressionMatch m = QRegularExpression(qsl("/([^/\\?]+)(\\?|$)")).match(updateUrl); - if (m.hasMatch()) { - fileName = m.captured(1).replace(QRegularExpression(qsl("[^a-zA-Z0-9_\\-]")), QString()); - } - if (fileName.isEmpty()) { - fileName = qsl("tupdate-%1").arg(rand_value() % 1000000); - } - QString dirStr = cWorkingDir() + qsl("tupdates/"); - fileName = dirStr + fileName; - QFileInfo file(fileName); - - QDir dir(dirStr); - if (dir.exists()) { - QFileInfoList all = dir.entryInfoList(QDir::Files); - for (QFileInfoList::iterator i = all.begin(), e = all.end(); i != e; ++i) { - if (i->absoluteFilePath() != file.absoluteFilePath()) { - QFile::remove(i->absoluteFilePath()); - } - } - } else { - dir.mkdir(dir.absolutePath()); - } - outputFile.setFileName(fileName); - if (file.exists()) { - uint64 fullSize = file.size(); - if (fullSize < INT_MAX) { - int32 goodSize = (int32)fullSize; - if (goodSize % UpdateChunk) { - goodSize = goodSize - (goodSize % UpdateChunk); - if (goodSize) { - if (outputFile.open(QIODevice::ReadOnly)) { - QByteArray goodData = outputFile.readAll().mid(0, goodSize); - outputFile.close(); - if (outputFile.open(QIODevice::WriteOnly)) { - outputFile.write(goodData); - outputFile.close(); - - QMutexLocker lock(&mutex); - already = goodSize; - } - } - } - } else { - QMutexLocker lock(&mutex); - already = goodSize; - } - } - if (!already) { - QFile::remove(fileName); - } - } -} - -void UpdateChecker::start() { - sendRequest(); -} - -void UpdateChecker::sendRequest() { - QNetworkRequest req(updateUrl); - QByteArray rangeHeaderValue = "bytes=" + QByteArray::number(already) + "-"; - req.setRawHeader("Range", rangeHeaderValue); - req.setAttribute(QNetworkRequest::HttpPipeliningAllowedAttribute, true); - if (reply) reply->deleteLater(); - reply = manager.get(req); - connect(reply, SIGNAL(downloadProgress(qint64,qint64)), this, SLOT(partFinished(qint64,qint64))); - connect(reply, SIGNAL(error(QNetworkReply::NetworkError)), this, SLOT(partFailed(QNetworkReply::NetworkError))); - connect(reply, SIGNAL(metaDataChanged()), this, SLOT(partMetaGot())); -} - -void UpdateChecker::partMetaGot() { - typedef QList Pairs; - Pairs pairs = reply->rawHeaderPairs(); - for (Pairs::iterator i = pairs.begin(), e = pairs.end(); i != e; ++i) { - if (QString::fromUtf8(i->first).toLower() == "content-range") { - QRegularExpressionMatch m = QRegularExpression(qsl("/(\\d+)([^\\d]|$)")).match(QString::fromUtf8(i->second)); - if (m.hasMatch()) { - { - QMutexLocker lock(&mutex); - full = m.captured(1).toInt(); - } - - Sandbox::updateProgress(already, full); - } - } - } -} - -int32 UpdateChecker::ready() { - QMutexLocker lock(&mutex); - return already; -} - -int32 UpdateChecker::size() { - QMutexLocker lock(&mutex); - return full; -} - -void UpdateChecker::partFinished(qint64 got, qint64 total) { - if (!reply) return; - - QVariant statusCode = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute); - if (statusCode.isValid()) { - int status = statusCode.toInt(); - if (status != 200 && status != 206 && status != 416) { - LOG(("Update Error: Bad HTTP status received in partFinished(): %1").arg(status)); - return fatalFail(); - } - } - - if (!already && !full) { - QMutexLocker lock(&mutex); - full = total; - } - DEBUG_LOG(("Update Info: part %1 of %2").arg(got).arg(total)); - - if (!outputFile.isOpen()) { - if (!outputFile.open(QIODevice::Append)) { - LOG(("Update Error: Could not open output file '%1' for appending").arg(outputFile.fileName())); - return fatalFail(); - } - } - QByteArray r = reply->readAll(); - if (!r.isEmpty()) { - outputFile.write(r); - - QMutexLocker lock(&mutex); - already += r.size(); - } - if (got >= total) { - reply->deleteLater(); - reply = 0; - outputFile.close(); - unpackUpdate(); - } else { - Sandbox::updateProgress(already, full); - } -} - -void UpdateChecker::partFailed(QNetworkReply::NetworkError e) { - if (!reply) return; - - QVariant statusCode = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute); - reply->deleteLater(); - reply = 0; - if (statusCode.isValid()) { - int status = statusCode.toInt(); - if (status == 416) { // Requested range not satisfiable - outputFile.close(); - unpackUpdate(); - return; - } - } - LOG(("Update Error: failed to download part starting from %1, error %2").arg(already).arg(e)); - Sandbox::updateFailed(); -} - -void UpdateChecker::fatalFail() { - clearAll(); - Sandbox::updateFailed(); -} - -void UpdateChecker::clearAll() { - psDeleteDir(cWorkingDir() + qsl("tupdates")); -} - -//QString winapiErrorWrap() { -// WCHAR errMsg[2048]; -// DWORD errorCode = GetLastError(); -// LPTSTR errorText = NULL, errorTextDefault = L"(Unknown error)"; -// FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_IGNORE_INSERTS, NULL, errorCode, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPTSTR)&errorText, 0, 0); -// if (!errorText) { -// errorText = errorTextDefault; -// } -// StringCbPrintf(errMsg, sizeof(errMsg), L"Error code: %d, error message: %s", errorCode, errorText); -// if (errorText != errorTextDefault) { -// LocalFree(errorText); -// } -// return QString::fromWCharArray(errMsg); -//} - -void UpdateChecker::unpackUpdate() { - QByteArray packed; - if (!outputFile.open(QIODevice::ReadOnly)) { - LOG(("Update Error: cant read updates file!")); - return fatalFail(); - } - -#ifdef Q_OS_WIN // use Lzma SDK for win - const int32 hSigLen = 128, hShaLen = 20, hPropsLen = LZMA_PROPS_SIZE, hOriginalSizeLen = sizeof(int32), hSize = hSigLen + hShaLen + hPropsLen + hOriginalSizeLen; // header -#else // Q_OS_WIN - const int32 hSigLen = 128, hShaLen = 20, hPropsLen = 0, hOriginalSizeLen = sizeof(int32), hSize = hSigLen + hShaLen + hOriginalSizeLen; // header -#endif // Q_OS_WIN - - QByteArray compressed = outputFile.readAll(); - int32 compressedLen = compressed.size() - hSize; - if (compressedLen <= 0) { - LOG(("Update Error: bad compressed size: %1").arg(compressed.size())); - return fatalFail(); - } - outputFile.close(); - - QString tempDirPath = cWorkingDir() + qsl("tupdates/temp"), readyFilePath = cWorkingDir() + qsl("tupdates/temp/ready"); - psDeleteDir(tempDirPath); - - QDir tempDir(tempDirPath); - if (tempDir.exists() || QFile(readyFilePath).exists()) { - LOG(("Update Error: cant clear tupdates/temp dir!")); - return fatalFail(); - } - - uchar sha1Buffer[20]; - bool goodSha1 = !memcmp(compressed.constData() + hSigLen, hashSha1(compressed.constData() + hSigLen + hShaLen, compressedLen + hPropsLen + hOriginalSizeLen, sha1Buffer), hShaLen); - if (!goodSha1) { - LOG(("Update Error: bad SHA1 hash of update file!")); - return fatalFail(); - } - - RSA *pbKey = PEM_read_bio_RSAPublicKey(BIO_new_mem_buf(const_cast(AppAlphaVersion ? UpdatesPublicAlphaKey : UpdatesPublicKey), -1), 0, 0, 0); - if (!pbKey) { - LOG(("Update Error: cant read public rsa key!")); - return fatalFail(); - } - if (RSA_verify(NID_sha1, (const uchar*)(compressed.constData() + hSigLen), hShaLen, (const uchar*)(compressed.constData()), hSigLen, pbKey) != 1) { // verify signature - RSA_free(pbKey); - if (cAlphaVersion() || cBetaVersion()) { // try other public key, if we are in alpha or beta version - pbKey = PEM_read_bio_RSAPublicKey(BIO_new_mem_buf(const_cast(AppAlphaVersion ? UpdatesPublicKey : UpdatesPublicAlphaKey), -1), 0, 0, 0); - if (!pbKey) { - LOG(("Update Error: cant read public rsa key!")); - return fatalFail(); - } - if (RSA_verify(NID_sha1, (const uchar*)(compressed.constData() + hSigLen), hShaLen, (const uchar*)(compressed.constData()), hSigLen, pbKey) != 1) { // verify signature - RSA_free(pbKey); - LOG(("Update Error: bad RSA signature of update file!")); - return fatalFail(); - } - } else { - LOG(("Update Error: bad RSA signature of update file!")); - return fatalFail(); - } - } - RSA_free(pbKey); - - QByteArray uncompressed; - - int32 uncompressedLen; - memcpy(&uncompressedLen, compressed.constData() + hSigLen + hShaLen + hPropsLen, hOriginalSizeLen); - uncompressed.resize(uncompressedLen); - - size_t resultLen = uncompressed.size(); -#ifdef Q_OS_WIN // use Lzma SDK for win - SizeT srcLen = compressedLen; - int uncompressRes = LzmaUncompress((uchar*)uncompressed.data(), &resultLen, (const uchar*)(compressed.constData() + hSize), &srcLen, (const uchar*)(compressed.constData() + hSigLen + hShaLen), LZMA_PROPS_SIZE); - if (uncompressRes != SZ_OK) { - LOG(("Update Error: could not uncompress lzma, code: %1").arg(uncompressRes)); - return fatalFail(); - } -#else // Q_OS_WIN - lzma_stream stream = LZMA_STREAM_INIT; - - lzma_ret ret = lzma_stream_decoder(&stream, UINT64_MAX, LZMA_CONCATENATED); - if (ret != LZMA_OK) { - const char *msg; - switch (ret) { - case LZMA_MEM_ERROR: msg = "Memory allocation failed"; break; - case LZMA_OPTIONS_ERROR: msg = "Specified preset is not supported"; break; - case LZMA_UNSUPPORTED_CHECK: msg = "Specified integrity check is not supported"; break; - default: msg = "Unknown error, possibly a bug"; break; - } - LOG(("Error initializing the decoder: %1 (error code %2)").arg(msg).arg(ret)); - return fatalFail(); - } - - stream.avail_in = compressedLen; - stream.next_in = (uint8_t*)(compressed.constData() + hSize); - stream.avail_out = resultLen; - stream.next_out = (uint8_t*)uncompressed.data(); - - lzma_ret res = lzma_code(&stream, LZMA_FINISH); - if (stream.avail_in) { - LOG(("Error in decompression, %1 bytes left in _in of %2 whole.").arg(stream.avail_in).arg(compressedLen)); - return fatalFail(); - } else if (stream.avail_out) { - LOG(("Error in decompression, %1 bytes free left in _out of %2 whole.").arg(stream.avail_out).arg(resultLen)); - return fatalFail(); - } - lzma_end(&stream); - if (res != LZMA_OK && res != LZMA_STREAM_END) { - const char *msg; - switch (res) { - case LZMA_MEM_ERROR: msg = "Memory allocation failed"; break; - case LZMA_FORMAT_ERROR: msg = "The input data is not in the .xz format"; break; - case LZMA_OPTIONS_ERROR: msg = "Unsupported compression options"; break; - case LZMA_DATA_ERROR: msg = "Compressed file is corrupt"; break; - case LZMA_BUF_ERROR: msg = "Compressed data is truncated or otherwise corrupt"; break; - default: msg = "Unknown error, possibly a bug"; break; - } - LOG(("Error in decompression: %1 (error code %2)").arg(msg).arg(res)); - return fatalFail(); - } -#endif // Q_OS_WIN - - tempDir.mkdir(tempDir.absolutePath()); - - quint32 version; - { - QDataStream stream(uncompressed); - stream.setVersion(QDataStream::Qt_5_1); - - stream >> version; - if (stream.status() != QDataStream::Ok) { - LOG(("Update Error: cant read version from downloaded stream, status: %1").arg(stream.status())); - return fatalFail(); - } - - quint64 betaVersion = 0; - if (version == 0x7FFFFFFF) { // beta version - stream >> betaVersion; - if (stream.status() != QDataStream::Ok) { - LOG(("Update Error: cant read beta version from downloaded stream, status: %1").arg(stream.status())); - return fatalFail(); - } - if (!cBetaVersion() || betaVersion <= cBetaVersion()) { - LOG(("Update Error: downloaded beta version %1 is not greater, than mine %2").arg(betaVersion).arg(cBetaVersion())); - return fatalFail(); - } - } else if (int32(version) <= AppVersion) { - LOG(("Update Error: downloaded version %1 is not greater, than mine %2").arg(version).arg(AppVersion)); - return fatalFail(); - } - - quint32 filesCount; - stream >> filesCount; - if (stream.status() != QDataStream::Ok) { - LOG(("Update Error: cant read files count from downloaded stream, status: %1").arg(stream.status())); - return fatalFail(); - } - if (!filesCount) { - LOG(("Update Error: update is empty!")); - return fatalFail(); - } - for (uint32 i = 0; i < filesCount; ++i) { - QString relativeName; - quint32 fileSize; - QByteArray fileInnerData; - bool executable = false; - - stream >> relativeName >> fileSize >> fileInnerData; -#if defined Q_OS_MAC || defined Q_OS_LINUX - stream >> executable; -#endif // Q_OS_MAC || Q_OS_LINUX - if (stream.status() != QDataStream::Ok) { - LOG(("Update Error: cant read file from downloaded stream, status: %1").arg(stream.status())); - return fatalFail(); - } - if (fileSize != quint32(fileInnerData.size())) { - LOG(("Update Error: bad file size %1 not matching data size %2").arg(fileSize).arg(fileInnerData.size())); - return fatalFail(); - } - - QFile f(tempDirPath + '/' + relativeName); - if (!QDir().mkpath(QFileInfo(f).absolutePath())) { - LOG(("Update Error: cant mkpath for file '%1'").arg(tempDirPath + '/' + relativeName)); - return fatalFail(); - } - if (!f.open(QIODevice::WriteOnly)) { - LOG(("Update Error: cant open file '%1' for writing").arg(tempDirPath + '/' + relativeName)); - return fatalFail(); - } - auto writtenBytes = f.write(fileInnerData); - if (writtenBytes != fileSize) { - f.close(); - LOG(("Update Error: cant write file '%1', desiredSize: %2, write result: %3").arg(tempDirPath + '/' + relativeName).arg(fileSize).arg(writtenBytes)); - return fatalFail(); - } - f.close(); - if (executable) { - QFileDevice::Permissions p = f.permissions(); - p |= QFileDevice::ExeOwner | QFileDevice::ExeUser | QFileDevice::ExeGroup | QFileDevice::ExeOther; - f.setPermissions(p); - } - } - - // create tdata/version file - tempDir.mkdir(QDir(tempDirPath + qsl("/tdata")).absolutePath()); - std::wstring versionString = ((version % 1000) ? QString("%1.%2.%3").arg(int(version / 1000000)).arg(int((version % 1000000) / 1000)).arg(int(version % 1000)) : QString("%1.%2").arg(int(version / 1000000)).arg(int((version % 1000000) / 1000))).toStdWString(); - - VerInt versionNum = VerInt(version), versionLen = VerInt(versionString.size() * sizeof(VerChar)); - VerChar versionStr[32]; - memcpy(versionStr, versionString.c_str(), versionLen); - - QFile fVersion(tempDirPath + qsl("/tdata/version")); - if (!fVersion.open(QIODevice::WriteOnly)) { - LOG(("Update Error: cant write version file '%1'").arg(tempDirPath + qsl("/version"))); - return fatalFail(); - } - fVersion.write((const char*)&versionNum, sizeof(VerInt)); - if (versionNum == 0x7FFFFFFF) { // beta version - fVersion.write((const char*)&betaVersion, sizeof(quint64)); - } else { - fVersion.write((const char*)&versionLen, sizeof(VerInt)); - fVersion.write((const char*)&versionStr[0], versionLen); - } - fVersion.close(); - } - - QFile readyFile(readyFilePath); - if (readyFile.open(QIODevice::WriteOnly)) { - if (readyFile.write("1", 1)) { - readyFile.close(); - } else { - LOG(("Update Error: cant write ready file '%1'").arg(readyFilePath)); - return fatalFail(); - } - } else { - LOG(("Update Error: cant create ready file '%1'").arg(readyFilePath)); - return fatalFail(); - } - outputFile.remove(); - - Sandbox::updateReady(); -} - -UpdateChecker::~UpdateChecker() { - delete reply; - reply = 0; -} - -bool checkReadyUpdate() { - QString readyFilePath = cWorkingDir() + qsl("tupdates/temp/ready"), readyPath = cWorkingDir() + qsl("tupdates/temp"); - if (!QFile(readyFilePath).exists() || cExeName().isEmpty()) { - if (QDir(cWorkingDir() + qsl("tupdates/ready")).exists() || QDir(cWorkingDir() + qsl("tupdates/temp")).exists()) { - UpdateChecker::clearAll(); - } - return false; - } - - // check ready version - QString versionPath = readyPath + qsl("/tdata/version"); - { - QFile fVersion(versionPath); - if (!fVersion.open(QIODevice::ReadOnly)) { - LOG(("Update Error: cant read version file '%1'").arg(versionPath)); - UpdateChecker::clearAll(); - return false; - } - VerInt versionNum; - if (fVersion.read((char*)&versionNum, sizeof(VerInt)) != sizeof(VerInt)) { - LOG(("Update Error: cant read version from file '%1'").arg(versionPath)); - UpdateChecker::clearAll(); - return false; - } - if (versionNum == 0x7FFFFFFF) { // beta version - quint64 betaVersion = 0; - if (fVersion.read((char*)&betaVersion, sizeof(quint64)) != sizeof(quint64)) { - LOG(("Update Error: cant read beta version from file '%1'").arg(versionPath)); - UpdateChecker::clearAll(); - return false; - } - if (!cBetaVersion() || betaVersion <= cBetaVersion()) { - LOG(("Update Error: cant install beta version %1 having beta version %2").arg(betaVersion).arg(cBetaVersion())); - UpdateChecker::clearAll(); - return false; - } - } else if (versionNum <= AppVersion) { - LOG(("Update Error: cant install version %1 having version %2").arg(versionNum).arg(AppVersion)); - UpdateChecker::clearAll(); - return false; - } - fVersion.close(); - } - -#ifdef Q_OS_WIN - QString curUpdater = (cExeDir() + qsl("Updater.exe")); - QFileInfo updater(cWorkingDir() + qsl("tupdates/temp/Updater.exe")); -#elif defined Q_OS_MAC // Q_OS_WIN - QString curUpdater = (cExeDir() + cExeName() + qsl("/Contents/Frameworks/Updater")); - QFileInfo updater(cWorkingDir() + qsl("tupdates/temp/Telegram.app/Contents/Frameworks/Updater")); -#elif defined Q_OS_LINUX // Q_OS_MAC - QString curUpdater = (cExeDir() + qsl("Updater")); - QFileInfo updater(cWorkingDir() + qsl("tupdates/temp/Updater")); -#endif // Q_OS_LINUX - if (!updater.exists()) { - QFileInfo current(curUpdater); - if (!current.exists()) { - UpdateChecker::clearAll(); - return false; - } - if (!QFile(current.absoluteFilePath()).copy(updater.absoluteFilePath())) { - UpdateChecker::clearAll(); - return false; - } - } -#ifdef Q_OS_WIN - if (CopyFile(updater.absoluteFilePath().toStdWString().c_str(), curUpdater.toStdWString().c_str(), FALSE) == FALSE) { - DWORD errorCode = GetLastError(); - if (errorCode == ERROR_ACCESS_DENIED) { // we are in write-protected dir, like Program Files - cSetWriteProtected(true); - return true; - } else { - UpdateChecker::clearAll(); - return false; - } - } - if (DeleteFile(updater.absoluteFilePath().toStdWString().c_str()) == FALSE) { - UpdateChecker::clearAll(); - return false; - } -#elif defined Q_OS_MAC // Q_OS_WIN - QDir().mkpath(QFileInfo(curUpdater).absolutePath()); - DEBUG_LOG(("Update Info: moving %1 to %2...").arg(updater.absoluteFilePath()).arg(curUpdater)); - if (!objc_moveFile(updater.absoluteFilePath(), curUpdater)) { - UpdateChecker::clearAll(); - return false; - } -#elif defined Q_OS_LINUX // Q_OS_MAC - if (!linuxMoveFile(QFile::encodeName(updater.absoluteFilePath()).constData(), QFile::encodeName(curUpdater).constData())) { - UpdateChecker::clearAll(); - return false; - } -#endif // Q_OS_LINUX - return true; -} - -#endif // !TDESKTOP_DISABLE_AUTOUPDATE - -QString countBetaVersionSignature(uint64 version) { // duplicated in packer.cpp - if (cBetaPrivateKey().isEmpty()) { - LOG(("Error: Trying to count beta version signature without beta private key!")); - return QString(); - } - - QByteArray signedData = (qstr("TelegramBeta_") + QString::number(version, 16).toLower()).toUtf8(); - - static const int32 shaSize = 20, keySize = 128; - - uchar sha1Buffer[shaSize]; - hashSha1(signedData.constData(), signedData.size(), sha1Buffer); // count sha1 - - uint32 siglen = 0; - - RSA *prKey = PEM_read_bio_RSAPrivateKey(BIO_new_mem_buf(const_cast(cBetaPrivateKey().constData()), -1), 0, 0, 0); - if (!prKey) { - LOG(("Error: Could not read beta private key!")); - return QString(); - } - if (RSA_size(prKey) != keySize) { - LOG(("Error: Bad beta private key size: %1").arg(RSA_size(prKey))); - RSA_free(prKey); - return QString(); - } - QByteArray signature; - signature.resize(keySize); - if (RSA_sign(NID_sha1, (const uchar*)(sha1Buffer), shaSize, (uchar*)(signature.data()), &siglen, prKey) != 1) { // count signature - LOG(("Error: Counting beta version signature failed!")); - RSA_free(prKey); - return QString(); - } - RSA_free(prKey); - - if (siglen != keySize) { - LOG(("Error: Bad beta version signature length: %1").arg(siglen)); - return QString(); - } - - signature = signature.toBase64(QByteArray::Base64UrlEncoding | QByteArray::OmitTrailingEquals); - signature = signature.replace('-', '8').replace('_', 'B'); - return QString::fromUtf8(signature.mid(19, 32)); -} diff --git a/Telegram/SourceFiles/autoupdater.h b/Telegram/SourceFiles/autoupdater.h deleted file mode 100644 index e82504291..000000000 --- a/Telegram/SourceFiles/autoupdater.h +++ /dev/null @@ -1,76 +0,0 @@ -/* -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 - -#ifndef TDESKTOP_DISABLE_AUTOUPDATE - -#include -#include -#include - -class UpdateChecker : public QObject { - Q_OBJECT - -public: - UpdateChecker(QThread *thread, const QString &url); - - void unpackUpdate(); - - qint32 ready(); - qint32 size(); - - static void clearAll(); - - ~UpdateChecker(); - -public slots: - - void start(); - void partMetaGot(); - void partFinished(qint64 got, qint64 total); - void partFailed(QNetworkReply::NetworkError e); - void sendRequest(); - -private: - void initOutput(); - - void fatalFail(); - - QString updateUrl; - QNetworkAccessManager manager; - QNetworkReply *reply; - qint32 already, full; - QFile outputFile; - - QMutex mutex; - -}; - -bool checkReadyUpdate(); - -#else // TDESKTOP_DISABLE_AUTOUPDATE -class UpdateChecker : public QObject { - Q_OBJECT -}; - -#endif // TDESKTOP_DISABLE_AUTOUPDATE - -QString countBetaVersionSignature(quint64 version); diff --git a/Telegram/SourceFiles/boxes/about_box.cpp b/Telegram/SourceFiles/boxes/about_box.cpp index 6f2ed8504..f545e9ec9 100644 --- a/Telegram/SourceFiles/boxes/about_box.cpp +++ b/Telegram/SourceFiles/boxes/about_box.cpp @@ -23,7 +23,6 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "lang/lang_keys.h" #include "mainwidget.h" #include "mainwindow.h" -#include "autoupdater.h" #include "boxes/confirm_box.h" #include "application.h" #include "ui/widgets/buttons.h" @@ -61,23 +60,7 @@ void AboutBox::resizeEvent(QResizeEvent *e) { } void AboutBox::showVersionHistory() { - if (cRealBetaVersion()) { - auto url = qsl("https://tdesktop.com/"); - switch (cPlatform()) { - case dbipWindows: url += qsl("win/%1.zip"); break; - case dbipMac: url += qsl("mac/%1.zip"); break; - case dbipMacOld: url += qsl("mac32/%1.zip"); break; - case dbipLinux32: url += qsl("linux32/%1.tar.xz"); break; - case dbipLinux64: url += qsl("linux/%1.tar.xz"); break; - } - url = url.arg(qsl("tbeta%1_%2").arg(cRealBetaVersion()).arg(countBetaVersionSignature(cRealBetaVersion()))); - - Application::clipboard()->setText(url); - - Ui::show(Box("The link to the current private beta version of Telegram Desktop was copied to the clipboard.")); - } else { - QDesktopServices::openUrl(qsl("https://desktop.telegram.org/changelog")); - } + QDesktopServices::openUrl(qsl("https://desktop.telegram.org/changelog")); } void AboutBox::keyPressEvent(QKeyEvent *e) { diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp index 8179b4286..bae6fcaee 100644 --- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp +++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp @@ -29,7 +29,6 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "mainwindow.h" #include "mainwidget.h" #include "ui/widgets/input_fields.h" -#include "autoupdater.h" #include "auth_session.h" #include "messenger.h" #include "ui/effects/widget_fade_wrap.h" @@ -118,13 +117,6 @@ DialogsWidget::DialogsWidget(QWidget *parent, not_null cont connect(_filter, SIGNAL(changed()), this, SLOT(onFilterUpdate())); connect(_filter, SIGNAL(cursorPositionChanged(int,int)), this, SLOT(onFilterCursorMoved(int,int))); -#ifndef TDESKTOP_DISABLE_AUTOUPDATE - Sandbox::connect(SIGNAL(updateLatest()), this, SLOT(onCheckUpdateStatus())); - Sandbox::connect(SIGNAL(updateFailed()), this, SLOT(onCheckUpdateStatus())); - Sandbox::connect(SIGNAL(updateReady()), this, SLOT(onCheckUpdateStatus())); - onCheckUpdateStatus(); -#endif // !TDESKTOP_DISABLE_AUTOUPDATE - subscribe(Adaptive::Changed(), [this] { updateForwardBar(); }); _cancelSearch->setClickedCallback([this] { onCancelSearch(); }); @@ -162,24 +154,6 @@ DialogsWidget::DialogsWidget(QWidget *parent, not_null cont updateSearchFromVisibility(true); } -#ifndef TDESKTOP_DISABLE_AUTOUPDATE -void DialogsWidget::onCheckUpdateStatus() { - if (Sandbox::updatingState() == Application::UpdatingReady) { - if (_updateTelegram) return; - _updateTelegram.create(this); - _updateTelegram->show(); - _updateTelegram->setClickedCallback([] { - checkReadyUpdate(); - App::restart(); - }); - } else { - if (!_updateTelegram) return; - _updateTelegram.destroy(); - } - updateControlsGeometry(); -} -#endif // TDESKTOP_DISABLE_AUTOUPDATE - void DialogsWidget::activate() { _filter->setFocus(); _inner->activate(); diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.h b/Telegram/SourceFiles/dialogs/dialogs_widget.h index a20480967..f7984ec36 100644 --- a/Telegram/SourceFiles/dialogs/dialogs_widget.h +++ b/Telegram/SourceFiles/dialogs/dialogs_widget.h @@ -129,10 +129,6 @@ public slots: private slots: void onDraggingScrollTimer(); -#ifndef TDESKTOP_DISABLE_AUTOUPDATE - void onCheckUpdateStatus(); -#endif // TDESKTOP_DISABLE_AUTOUPDATE - protected: void dragEnterEvent(QDragEnterEvent *e) override; void dragMoveEvent(QDragMoveEvent *e) override; diff --git a/Telegram/SourceFiles/intro/introwidget.cpp b/Telegram/SourceFiles/intro/introwidget.cpp index 553523974..94f11392d 100644 --- a/Telegram/SourceFiles/intro/introwidget.cpp +++ b/Telegram/SourceFiles/intro/introwidget.cpp @@ -39,7 +39,6 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "ui/widgets/labels.h" #include "ui/effects/widget_fade_wrap.h" #include "ui/effects/slide_animation.h" -#include "autoupdater.h" #include "window/window_slide_animation.h" #include "styles/style_boxes.h" #include "styles/style_intro.h" @@ -88,14 +87,6 @@ Widget::Widget(QWidget *parent) : TWidget(parent) getStep()->showFast(); cSetPasswordRecovered(false); - -#ifndef TDESKTOP_DISABLE_AUTOUPDATE - Sandbox::connect(SIGNAL(updateLatest()), this, SLOT(onCheckUpdateStatus())); - Sandbox::connect(SIGNAL(updateFailed()), this, SLOT(onCheckUpdateStatus())); - Sandbox::connect(SIGNAL(updateReady()), this, SLOT(onCheckUpdateStatus())); - Sandbox::startUpdateCheck(); - onCheckUpdateStatus(); -#endif // !TDESKTOP_DISABLE_AUTOUPDATE } void Widget::refreshLang() { @@ -134,24 +125,6 @@ void Widget::createLanguageLink() { } } -#ifndef TDESKTOP_DISABLE_AUTOUPDATE -void Widget::onCheckUpdateStatus() { - if (Sandbox::updatingState() == Application::UpdatingReady) { - if (_update) return; - _update.create(this, object_ptr(this, langFactory(lng_menu_update), st::defaultBoxButton), st::introCoverDuration); - if (!_a_show.animating()) _update->show(); - _update->entity()->setClickedCallback([] { - checkReadyUpdate(); - App::restart(); - }); - } else { - if (!_update) return; - _update.destroy(); - } - updateControlsGeometry(); -} -#endif // TDESKTOP_DISABLE_AUTOUPDATE - void Widget::setInnerFocus() { if (getStep()->animating()) { setFocus(); diff --git a/Telegram/SourceFiles/intro/introwidget.h b/Telegram/SourceFiles/intro/introwidget.h index 0574a2a82..b344f0ea1 100644 --- a/Telegram/SourceFiles/intro/introwidget.h +++ b/Telegram/SourceFiles/intro/introwidget.h @@ -55,11 +55,6 @@ protected: signals: void countryChanged(); -#ifndef TDESKTOP_DISABLE_AUTOUPDATE -private slots: - void onCheckUpdateStatus(); -#endif // TDESKTOP_DISABLE_AUTOUPDATE - // Internal interface. public: struct Data { diff --git a/Telegram/SourceFiles/main.cpp b/Telegram/SourceFiles/main.cpp index 5b29d3f11..de6daec28 100644 --- a/Telegram/SourceFiles/main.cpp +++ b/Telegram/SourceFiles/main.cpp @@ -55,12 +55,6 @@ int main(int argc, char *argv[]) { 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(); diff --git a/Telegram/SourceFiles/mainwidget.cpp b/Telegram/SourceFiles/mainwidget.cpp index 552aef029..28679fb11 100644 --- a/Telegram/SourceFiles/mainwidget.cpp +++ b/Telegram/SourceFiles/mainwidget.cpp @@ -233,10 +233,6 @@ MainWidget::MainWidget(QWidget *parent, not_null controller orderWidgets(); _sideResizeArea->installEventFilter(this); - -#ifndef TDESKTOP_DISABLE_AUTOUPDATE - Sandbox::startUpdateCheck(); -#endif // !TDESKTOP_DISABLE_AUTOUPDATE } void MainWidget::checkCurrentFloatPlayer() { diff --git a/Telegram/SourceFiles/mainwindow.cpp b/Telegram/SourceFiles/mainwindow.cpp index c0b6477c4..cd28e6aa0 100644 --- a/Telegram/SourceFiles/mainwindow.cpp +++ b/Telegram/SourceFiles/mainwindow.cpp @@ -42,7 +42,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" @@ -1181,10 +1180,6 @@ LastCrashedWindow::LastCrashedWindow() , _sendingTotal(0) , _checkReply(0) , _sendReply(0) -#ifndef TDESKTOP_DISABLE_AUTOUPDATE -, _updatingCheck(this) -, _updatingSkip(this, false) -#endif // !TDESKTOP_DISABLE_AUTOUPDATE { excludeReportUsername(); @@ -1256,35 +1251,10 @@ LastCrashedWindow::LastCrashedWindow() _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)); @@ -1503,139 +1473,6 @@ 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) { @@ -1707,7 +1544,6 @@ void LastCrashedWindow::updateControls() { _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); @@ -1730,105 +1566,12 @@ void LastCrashedWindow::onNetworkSettingsSaved(QString host, quint32 port, QStri 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(); @@ -1898,27 +1641,6 @@ void LastCrashedWindow::resizeEvent(QResizeEvent *e) { _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); @@ -1927,7 +1649,7 @@ void LastCrashedWindow::resizeEvent(QResizeEvent *e) { _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 { diff --git a/Telegram/SourceFiles/mainwindow.h b/Telegram/SourceFiles/mainwindow.h index cbedfd911..3c790c69f 100644 --- a/Telegram/SourceFiles/mainwindow.h +++ b/Telegram/SourceFiles/mainwindow.h @@ -299,17 +299,6 @@ public slots: 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); @@ -356,23 +345,6 @@ private: 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); diff --git a/Telegram/SourceFiles/settings/settings_general_widget.cpp b/Telegram/SourceFiles/settings/settings_general_widget.cpp index 38fe46a1b..7410ed04c 100644 --- a/Telegram/SourceFiles/settings/settings_general_widget.cpp +++ b/Telegram/SourceFiles/settings/settings_general_widget.cpp @@ -36,127 +36,9 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "lang/lang_file_parser.h" #include "lang/lang_cloud_manager.h" #include "messenger.h" -#include "autoupdater.h" namespace Settings { -#ifndef TDESKTOP_DISABLE_AUTOUPDATE -UpdateStateRow::UpdateStateRow(QWidget *parent) : TWidget(parent) -, _check(this, lang(lng_settings_check_now)) -, _restart(this, lang(lng_settings_update_now)) { - connect(_check, SIGNAL(clicked()), this, SLOT(onCheck())); - connect(_restart, SIGNAL(clicked()), this, SIGNAL(restart())); - - Sandbox::connect(SIGNAL(updateChecking()), this, SLOT(onChecking())); - Sandbox::connect(SIGNAL(updateLatest()), this, SLOT(onLatest())); - Sandbox::connect(SIGNAL(updateProgress(qint64, qint64)), this, SLOT(onDownloading(qint64, qint64))); - Sandbox::connect(SIGNAL(updateFailed()), this, SLOT(onFailed())); - Sandbox::connect(SIGNAL(updateReady()), this, SLOT(onReady())); - - _versionText = lng_settings_current_version_label(lt_version, currentVersionText()); - - switch (Sandbox::updatingState()) { - case Application::UpdatingDownload: - setState(State::Download, true); - setDownloadProgress(Sandbox::updatingReady(), Sandbox::updatingSize()); - break; - case Application::UpdatingReady: setState(State::Ready, true); break; - default: setState(State::None, true); break; - } -} - -int UpdateStateRow::resizeGetHeight(int newWidth) { - auto labelWidth = [](const QString &label) { - return st::linkFont->width(label) + st::linkFont->spacew; - }; - auto checkLeft = (_state == State::Latest) ? labelWidth(lang(lng_settings_latest_installed)) : labelWidth(_versionText); - auto restartLeft = labelWidth(lang(lng_settings_update_ready)); - - _check->resizeToWidth(qMin(newWidth, _check->naturalWidth())); - _check->moveToLeft(checkLeft, 0, newWidth); - - _restart->resizeToWidth(qMin(newWidth, _restart->naturalWidth())); - _restart->moveToLeft(restartLeft, 0, newWidth); - - return _check->height(); -} - -void UpdateStateRow::paintEvent(QPaintEvent *e) { - Painter p(this); - - auto text = ([this]() -> QString { - switch (_state) { - case State::Check: return lang(lng_settings_update_checking); - case State::Latest: return lang(lng_settings_latest_installed); - case State::Download: return _downloadText; - case State::Ready: return lang(lng_settings_update_ready); - case State::Fail: return lang(lng_settings_update_fail); - default: return _versionText; - } - })(); - p.setFont(st::linkFont); - p.setPen((_state == State::None) ? st::windowFg : st::settingsUpdateFg); - p.drawTextLeft(0, 0, width(), text); -} - -void UpdateStateRow::onCheck() { - if (!cAutoUpdate()) return; - - setState(State::Check); - cSetLastUpdateCheck(0); - Sandbox::startUpdateCheck(); -} - -void UpdateStateRow::setState(State state, bool force) { - if (_state != state || force) { - _state = state; - switch (state) { - case State::None: _check->show(); _restart->hide(); break; - case State::Ready: _check->hide(); _restart->show(); break; - case State::Check: - case State::Download: - case State::Latest: - case State::Fail: _check->hide(); _restart->hide(); break; - } - resizeToWidth(width()); - sendSynteticMouseEvent(this, QEvent::MouseMove, Qt::NoButton); - update(); - } -} - -void UpdateStateRow::setDownloadProgress(qint64 ready, qint64 total) { - auto readyTenthMb = (ready * 10 / (1024 * 1024)), totalTenthMb = (total * 10 / (1024 * 1024)); - auto readyStr = QString::number(readyTenthMb / 10) + '.' + QString::number(readyTenthMb % 10); - auto totalStr = QString::number(totalTenthMb / 10) + '.' + QString::number(totalTenthMb % 10); - auto result = lng_settings_downloading(lt_ready, readyStr, lt_total, totalStr); - if (_downloadText != result) { - _downloadText = result; - update(); - } -} - -void UpdateStateRow::onChecking() { - setState(State::Check); -} - -void UpdateStateRow::onLatest() { - setState(State::Latest); -} - -void UpdateStateRow::onDownloading(qint64 ready, qint64 total) { - setState(State::Download); - setDownloadProgress(ready, total); -} - -void UpdateStateRow::onReady() { - setState(State::Ready); -} - -void UpdateStateRow::onFailed() { - setState(State::Fail); -} -#endif // !TDESKTOP_DISABLE_AUTOUPDATE - GeneralWidget::GeneralWidget(QWidget *parent, UserData *self) : BlockWidget(parent, self, lang(lng_settings_section_general)) , _changeLanguage(this, lang(lng_settings_change_lang), st::boxLinkButton) { connect(_changeLanguage, SIGNAL(clicked()), this, SLOT(onChangeLanguage())); @@ -174,16 +56,6 @@ void GeneralWidget::refreshControls() { style::margins marginSmall(0, 0, 0, st::settingsSmallSkip); style::margins slidedPadding(0, marginSmall.bottom() / 2, 0, marginSmall.bottom() - (marginSmall.bottom() / 2)); -#ifndef TDESKTOP_DISABLE_AUTOUPDATE - addChildRow(_updateAutomatically, marginSub, lang(lng_settings_update_automatically), [this](bool) { onUpdateAutomatically(); }, cAutoUpdate()); - style::margins marginLink(st::defaultCheck.diameter + st::defaultBoxCheckbox.textPosition.x(), 0, 0, st::settingsSkip); - addChildRow(_updateRow, marginLink, slidedPadding); - connect(_updateRow->entity(), SIGNAL(restart()), this, SLOT(onRestart())); - if (!cAutoUpdate()) { - _updateRow->hideFast(); - } -#endif // !TDESKTOP_DISABLE_AUTOUPDATE - if (cPlatform() == dbipWindows || cSupportTray()) { auto workMode = Global::WorkMode().value(); addChildRow(_enableTrayIcon, marginSmall, lang(lng_settings_workmode_tray), [this](bool) { onEnableTrayIcon(); }, (workMode == dbiwmTrayOnly || workMode == dbiwmWindowAndTray)); @@ -224,25 +96,9 @@ void GeneralWidget::onChangeLanguage() { } void GeneralWidget::onRestart() { -#ifndef TDESKTOP_DISABLE_AUTOUPDATE - checkReadyUpdate(); -#endif // !TDESKTOP_DISABLE_AUTOUPDATE App::restart(); } -#ifndef TDESKTOP_DISABLE_AUTOUPDATE -void GeneralWidget::onUpdateAutomatically() { - cSetAutoUpdate(_updateAutomatically->checked()); - Local::writeSettings(); - _updateRow->toggleAnimated(cAutoUpdate()); - if (cAutoUpdate()) { - Sandbox::startUpdateCheck(); - } else { - Sandbox::stopUpdate(); - } -} -#endif // !TDESKTOP_DISABLE_AUTOUPDATE - void GeneralWidget::onEnableTrayIcon() { if ((!_enableTrayIcon->checked() || cPlatform() != dbipWindows) && _enableTaskbarIcon && !_enableTaskbarIcon->checked()) { _enableTaskbarIcon->setChecked(true); diff --git a/Telegram/SourceFiles/settings/settings_general_widget.h b/Telegram/SourceFiles/settings/settings_general_widget.h index 71f2260a1..852e77c75 100644 --- a/Telegram/SourceFiles/settings/settings_general_widget.h +++ b/Telegram/SourceFiles/settings/settings_general_widget.h @@ -24,56 +24,6 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org namespace Settings { -#ifndef TDESKTOP_DISABLE_AUTOUPDATE -class UpdateStateRow : public TWidget { - Q_OBJECT - -public: - UpdateStateRow(QWidget *parent); - - bool isUpdateReady() const { - return (_state == State::Ready); - } - -protected: - int resizeGetHeight(int newWidth) override; - - void paintEvent(QPaintEvent *e) override; - -signals: - void restart(); - -private slots: - void onCheck(); - - void onChecking(); - void onLatest(); - void onDownloading(qint64 ready, qint64 total); - void onReady(); - void onFailed(); - -private: - enum class State { - None, - Check, - Latest, - Download, - Fail, - Ready - }; - void setState(State state, bool force = false); - void setDownloadProgress(qint64 ready, qint64 total); - - object_ptr _check; - object_ptr _restart; - - State _state = State::None; - QString _downloadText; - QString _versionText; - -}; -#endif // !TDESKTOP_DISABLE_AUTOUPDATE - class GeneralWidget : public BlockWidget { Q_OBJECT @@ -86,10 +36,6 @@ protected: private slots: void onChangeLanguage(); -#ifndef TDESKTOP_DISABLE_AUTOUPDATE - void onUpdateAutomatically(); -#endif // !TDESKTOP_DISABLE_AUTOUPDATE - void onEnableTrayIcon(); void onEnableTaskbarIcon(); @@ -106,10 +52,6 @@ private: void updateWorkmode(); object_ptr _changeLanguage; -#ifndef TDESKTOP_DISABLE_AUTOUPDATE - object_ptr _updateAutomatically = { nullptr }; - object_ptr> _updateRow = { nullptr }; -#endif // !TDESKTOP_DISABLE_AUTOUPDATE object_ptr _enableTrayIcon = { nullptr }; object_ptr _enableTaskbarIcon = { nullptr }; object_ptr _autoStart = { nullptr }; diff --git a/Telegram/SourceFiles/storage/localstorage.cpp b/Telegram/SourceFiles/storage/localstorage.cpp index 4eeb777ad..505ebfe3d 100644 --- a/Telegram/SourceFiles/storage/localstorage.cpp +++ b/Telegram/SourceFiles/storage/localstorage.cpp @@ -1231,11 +1231,6 @@ bool _readSetting(quint32 blockId, QDataStream &stream, int version, ReadSetting if (!_checkStreamStatus(stream)) return false; cSetAutoUpdate(v == 1); -#ifndef TDESKTOP_DISABLE_AUTOUPDATE - if (!cAutoUpdate()) { - Sandbox::stopUpdate(); - } -#endif // !TDESKTOP_DISABLE_AUTOUPDATE } break; case dbiLastUpdateCheck: {