FOSS/AyuGramDesktop
1
0
Fork 0
mirror of https://github.com/AyuGram/AyuGramDesktop.git synced 2026-07-25 06:54:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't hold session pointer in Data::CloudImage.

Browse Source
This commit is contained in:
John Preston
2020-05-28 17:51:18 +04:00
parent 29a498b959
commit 249f7813c1
11 changed files with 81 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Telegram/SourceFiles/data/data_cloud_file.cpp
+14 -8
View File
@@ -26,24 +26,30 @@ void CloudImageView::set(
session->downloaderTaskFinished().notify();
}
CloudImage::CloudImage(not_null<Main::Session*> session)
: _session(session) {
CloudImage::CloudImage() = default;
CloudImage::CloudImage(
not_null<Main::Session*> session,
const ImageWithLocation &data) {
update(session, data);
}
Image *CloudImageView::image() const {
return _image.get();
}
void CloudImage::set(const ImageWithLocation &data) {
void CloudImage::update(
not_null<Main::Session*> session,
const ImageWithLocation &data) {
UpdateCloudFile(
_file,
data,
_session->data().cache(),
session->data().cache(),
kImageCacheTag,
[=](FileOrigin origin) { load(origin); },
[=](FileOrigin origin) { load(session, origin); },
[=](QImage preloaded) {
if (const auto view = activeView()) {
view->set(_session, data.preloaded);
view->set(session, data.preloaded);
}
});
}
@@ -60,7 +66,7 @@ bool CloudImage::failed() const {
return (_file.flags & CloudFile::Flag::Failed);
}
void CloudImage::load(FileOrigin origin) {
void CloudImage::load(not_null<Main::Session*> session, FileOrigin origin) {
const auto fromCloud = LoadFromCloudOrLocal;
const auto cacheTag = kImageCacheTag;
const auto autoLoading = false;
@@ -71,7 +77,7 @@ void CloudImage::load(FileOrigin origin) {
return true;
}, [=](QImage result) {
if (const auto active = activeView()) {
active->set(_session, std::move(result));
active->set(session, std::move(result));
}
});
}