i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Storage Kit: Do case conversion in SupportingApps::{Get,Set}SupportedTypes.

Browse Source 
We already convert everything to lowercase in BuildSupportingAppsTable(),
so we should do the same here.

Fixes #18752 (again.)
This commit is contained in:
Augustin Cavalier
2024-01-26 18:19:16 -05:00
parent 89fcf815e6
commit cdf3559b27
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/storage/mime/SupportingApps.cpp
+9 -5
View File
@@ -76,6 +76,9 @@ SupportingApps::GetSupportingApps(const char *type, BMessage *apps)
// Clear the message, as we're just going to add to it // Clear the message, as we're just going to add to it
apps->MakeEmpty(); apps->MakeEmpty();
BString typeString(type);
typeString.ToLower();
BMimeType mime(type); BMimeType mime(type);
status_t status = mime.InitCheck(); status_t status = mime.InitCheck();
if (status != B_OK) if (status != B_OK)
@@ -83,7 +86,7 @@ SupportingApps::GetSupportingApps(const char *type, BMessage *apps)
if (mime.IsSupertypeOnly()) { if (mime.IsSupertypeOnly()) {
// Add the apps that support this supertype (plus their count) // Add the apps that support this supertype (plus their count)
std::set<std::string> &superApps = fSupportingApps[type]; std::set<std::string> &superApps = fSupportingApps[typeString.String()];
int32 count = 0; int32 count = 0;
std::set<std::string>::const_iterator i; std::set<std::string>::const_iterator i;
for (i = superApps.begin(); i != superApps.end() && status == B_OK; i++) { for (i = superApps.begin(); i != superApps.end() && status == B_OK; i++) {
@@ -94,7 +97,7 @@ SupportingApps::GetSupportingApps(const char *type, BMessage *apps)
status = apps->AddInt32(kSupportingAppsSuperCountField, count); status = apps->AddInt32(kSupportingAppsSuperCountField, count);
} else { } else {
// Add the apps that support this subtype (plus their count) // Add the apps that support this subtype (plus their count)
std::set<std::string> &subApps = fSupportingApps[type]; std::set<std::string> &subApps = fSupportingApps[typeString.String()];
int32 count = 0; int32 count = 0;
std::set<std::string>::const_iterator i; std::set<std::string>::const_iterator i;
for (i = subApps.begin(); i != subApps.end() && status == B_OK; i++) { for (i = subApps.begin(); i != subApps.end() && status == B_OK; i++) {
@@ -177,10 +180,11 @@ SupportingApps::SetSupportedTypes(const char *app, const BMessage *types, bool f
// supported types list and adding the app as a supporting app for // supported types list and adding the app as a supporting app for
// each type. // each type.
newTypes.clear(); newTypes.clear();
const char *type; BString type;
for (int32 i = 0; types->FindString(kTypesField, i, &type) == B_OK; i++) { for (int32 i = 0; types->FindString(kTypesField, i, &type) == B_OK; i++) {
newTypes.insert(type); type.ToLower();
AddSupportingApp(type, app); newTypes.insert(type.String());
AddSupportingApp(type.String(), app);
} }
// Update the list of stranded types by removing any types that are newly // Update the list of stranded types by removing any types that are newly