void/AyuGramDesktop
2
0
Fork 0
mirror of https://github.com/AyuGram/AyuGramDesktop.git synced 2025-06-05 06:33:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Removed dcId from passport FileKey.

Browse source
This commit is contained in:
23rd 2021-08-24 18:36:26 +03:00
parent 559d488b0b
commit b3f8d0e81a
3 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Telegram/SourceFiles/passport/passport_form_controller.cpp
View file

@ -1745,7 +1745,7 @@ void FormController::loadFile(File &file) {
return; return;
} }
const auto key = FileKey{ file.id, file.dcId }; const auto key = FileKey{ file.id };
const auto i = _fileLoaders.find(key); const auto i = _fileLoaders.find(key);
if (i != _fileLoaders.end()) { if (i != _fileLoaders.end()) {
return; return;
@ -2466,14 +2466,14 @@ EditFile *FormController::findEditFile(const FullMsgId &fullId) {
EditFile *FormController::findEditFile(const FileKey &key) { EditFile *FormController::findEditFile(const FileKey &key) {
return findEditFileByCondition([&](const EditFile &file) { return findEditFileByCondition([&](const EditFile &file) {
return (file.fields.dcId == key.dcId && file.fields.id == key.id); return (file.fields.id == key.id);
}); });
} }
auto FormController::findFile(const FileKey &key) auto FormController::findFile(const FileKey &key)
-> std::pair<Value*, File*> { -> std::pair<Value*, File*> {
const auto found = [&](const File &file) { const auto found = [&](const File &file) {
return (file.dcId == key.dcId) && (file.id == key.id); return (file.id == key.id);
}; };
for (auto &pair : _form.values) { for (auto &pair : _form.values) {
auto &value = pair.second; auto &value = pair.second;

5
Telegram/SourceFiles/passport/passport_form_controller.h
View file

@ -336,16 +336,15 @@ struct PasswordSettings {
struct FileKey { struct FileKey {
uint64 id = 0; uint64 id = 0;
int32 dcId = 0;
inline bool operator==(const FileKey &other) const { inline bool operator==(const FileKey &other) const {
return (id == other.id) && (dcId == other.dcId); return (id == other.id);
} }
inline bool operator!=(const FileKey &other) const { inline bool operator!=(const FileKey &other) const {
return !(*this == other); return !(*this == other);
} }
inline bool operator<(const FileKey &other) const { inline bool operator<(const FileKey &other) const {
return (id < other.id) || ((id == other.id) && (dcId < other.dcId)); return (id < other.id);
} }
inline bool operator>(const FileKey &other) const { inline bool operator>(const FileKey &other) const {
return (other < *this); return (other < *this);

2
Telegram/SourceFiles/passport/passport_panel_controller.cpp
View file

@ -75,7 +75,7 @@ ScanInfo CollectScanInfo(const EditFile &file) {
}(); }();
return { return {
file.type, file.type,
FileKey{ file.fields.id, file.fields.dcId }, FileKey{ file.fields.id },
!file.fields.error.isEmpty() ? file.fields.error : status, !file.fields.error.isEmpty() ? file.fields.error : status,
file.fields.image, file.fields.image,
file.deleted, file.deleted,