fix: calculate a hash for the Tag property of ToastNotification. (#42272)

* fix: calculate a hash for the Tag property of ToastNotification.

Co-authored-by: bill.shen <shenyb32768@gmail.com>

* fix: calculate a hash for the Tag property of ToastNotification.

Co-authored-by: bill.shen <shenyb32768@gmail.com>

---------

Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com>
Co-authored-by: bill.shen <shenyb32768@gmail.com>
This commit is contained in:
trop[bot] 2024-05-26 20:05:45 +02:00 коммит произвёл GitHub
Родитель 81c184ffc1
Коммит 6b86fb4bbb
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: B5690EEEBB952194
1 изменённых файлов: 7 добавлений и 2 удалений

Просмотреть файл

@ -14,6 +14,7 @@
#include <wrl\wrappers\corewrappers.h>
#include "base/environment.h"
#include "base/hash/hash.h"
#include "base/logging.h"
#include "base/strings/strcat.h"
#include "base/strings/string_number_conversions.h"
@ -71,6 +72,10 @@ void DebugLog(std::string_view log_msg) {
LOG(INFO) << log_msg;
}
std::wstring GetTag(const std::string& notification_id) {
return base::NumberToWString(base::Hash(notification_id));
}
} // namespace
// static
@ -146,7 +151,7 @@ void WindowsToastNotification::Remove() {
return;
ScopedHString group(kGroup);
ScopedHString tag(base::as_wcstr(base::UTF8ToUTF16(notification_id())));
ScopedHString tag(GetTag(notification_id()));
notification_history->RemoveGroupedTagWithId(tag, group, app_id);
}
@ -199,7 +204,7 @@ HRESULT WindowsToastNotification::ShowInternal(
REPORT_AND_RETURN_IF_FAILED(toast2->put_Group(group),
"WinAPI: Setting group failed");
ScopedHString tag(base::as_wcstr(base::UTF8ToUTF16(notification_id())));
ScopedHString tag(GetTag(notification_id()));
REPORT_AND_RETURN_IF_FAILED(toast2->put_Tag(tag),
"WinAPI: Setting tag failed");