MrBesen
/
tdesktop
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix ringtones downloaded to disk.

This commit is contained in:
John Preston 2023-09-15 21:17:25 +04:00
parent 6adb3e7200
commit 7d678e5fa7
1 changed files with 29 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
Telegram/SourceFiles/window/notifications_manager.cpp
View File

@ -88,6 +88,25 @@ constexpr auto kSystemAlertDuration = crl::time(0);
return text;
}
[[nodiscard]] QByteArray ReadRingtoneBytes(
const std::shared_ptr<Data::DocumentMedia> &media) {
const auto result = media->bytes();
if (!result.isEmpty()) {
return result;
}
const auto &location = media->owner()->location();
if (!location.isEmpty() && location.accessEnable()) {
const auto guard = gsl::finally([&] {
location.accessDisable();
});
auto f = QFile(location.name());
if (f.open(QIODevice::ReadOnly)) {
return f.readAll();
}
}
return {};
}
} // namespace
const char kOptionGNotification[] = "gnotification";
@ -801,14 +820,16 @@ not_null<Media::Audio::Track*> System::lookupSound(
return i->second.get();
}
const auto &notifySettings = owner->notifySettings();
const auto custom = notifySettings.lookupRingtone(id);
if (custom && !custom->bytes().isEmpty()) {
const auto j = _customSoundTracks.emplace(
id,
Media::Audio::Current().createTrack()
).first;
j->second->fillFromData(bytes::make_vector(custom->bytes()));
return j->second.get();
if (const auto custom = notifySettings.lookupRingtone(id)) {
const auto bytes = ReadRingtoneBytes(custom);
if (!bytes.isEmpty()) {
const auto j = _customSoundTracks.emplace(
id,
Media::Audio::Current().createTrack()
).first;
j->second->fillFromData(bytes::make_vector(bytes));
return j->second.get();
}
}
ensureSoundCreated();
return _soundTrack.get();