mir/tdesktop
2
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-08-31 06:26:18 +00:00
Code Issues Releases Wiki Activity

Reorder chat settings sections.

Browse Source
This commit is contained in:
John Preston
2018-09-28 14:20:36 +03:00
parent 7ee1af5348
commit d485a05935
11 changed files with 52 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Telegram/SourceFiles/storage/cache/storage_cache_database_object.cpp vendored
View File

@@ -797,7 +797,7 @@ void DatabaseObject::put(
case File::Result::Success: {
const auto success = data.writeWithPadding(
bytes::make_span(value.bytes));
bytes::make_detached_span(value.bytes));
if (!success) {
data.close();
remove(key, nullptr);
@@ -964,7 +964,7 @@ QByteArray DatabaseObject::readValueData(PlaceId place, size_type size) const {
case File::Result::WrongKey: return QByteArray();
case File::Result::Success: {
auto result = QByteArray(size, Qt::Uninitialized);
const auto bytes = bytes::make_span(result);
const auto bytes = bytes::make_detached_span(result);
const auto read = data.readWithPadding(bytes);
if (read != size) {
return QByteArray();

16
Telegram/SourceFiles/storage/file_download.cpp
View File

@@ -783,7 +783,7 @@ void mtpFileLoader::cdnPartLoaded(const MTPupload_CdnFile &result, mtpRequestId
state.ivec[12] = static_cast<uchar>((counterOffset >> 24) & 0xFF);
auto decryptInPlace = result.c_upload_cdnFile().vbytes.v;
auto buffer = bytes::make_span(decryptInPlace);
auto buffer = bytes::make_detached_span(decryptInPlace);
MTP::aesCtrEncrypt(buffer, key.data(), &state);
switch (checkCdnFileHash(offset, buffer)) {
@@ -910,17 +910,7 @@ bool mtpFileLoader::feedPart(int offset, bytes::const_span buffer) {
return false;
}
} else {
if (offset > 100 * 1024 * 1024) {
// Debugging weird out of memory crashes.
auto info = QString("offset: %1, size: %2, cancelled: %3, finished: %4, filename: '%5', tocache: %6, fromcloud: %7, data: %8, fullsize: %9").arg(offset).arg(buffer.size()).arg(Logs::b(_cancelled)).arg(Logs::b(_finished)).arg(_filename).arg(int(_toCache)).arg(int(_fromCloud)).arg(_data.size()).arg(_size);
info += QString(", locationtype: %1, inqueue: %2, localstatus: %3").arg(int(_locationType)).arg(Logs::b(_inQueue)).arg(int(_localStatus));
CrashReports::SetAnnotation("DebugInfo", info);
}
_data.reserve(offset + buffer.size());
if (offset > 100 * 1024 * 1024) {
CrashReports::ClearAnnotation("DebugInfo");
}
if (offset > _data.size()) {
_skippedBytes += offset - _data.size();
_data.resize(offset);
@@ -932,7 +922,9 @@ bool mtpFileLoader::feedPart(int offset, bytes::const_span buffer) {
if (int64(offset + buffer.size()) > _data.size()) {
_data.resize(offset + buffer.size());
}
auto dst = bytes::make_span(_data).subspan(offset, buffer.size());
const auto dst = bytes::make_detached_span(_data).subspan(
offset,
buffer.size());
bytes::copy(dst, buffer);
}
}