Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-08-08 06:22:53 -04:00
Code Issues Projects Releases Packages Wiki Activity

Fix support for referenced URL fields

Browse source
This commit is contained in:
varjolintu 2022-11-12 11:27:28 +02:00 • committed by Jonathan White
parent c112ffc3fc
commit c1720c3711
5 changed files with 50 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/browser/BrowserService.cpp
View file

@ -814,7 +814,7 @@ QList<Entry*> BrowserService::sortEntries(QList<Entry*>& entries, const QString&
// Build map of prioritized entries
QMultiMap<int, Entry*> priorities;
for (auto* entry : entries) {
priorities.insert(sortPriority(getEntryURLs(entry), siteUrl, formUrl), entry);
priorities.insert(sortPriority(entry->getAllUrls(), siteUrl, formUrl), entry);
}
auto keys = priorities.uniqueKeys();
@ -1214,21 +1214,6 @@ QSharedPointer<Database> BrowserService::selectedDatabase()
return getDatabase();
}
QStringList BrowserService::getEntryURLs(const Entry* entry)
{
QStringList urlList;
urlList << entry->url();
// Handle additional URL's
for (const auto& key : entry->attributes()->keys()) {
if (key.startsWith(ADDITIONAL_URL)) {
urlList << entry->attributes()->value(key);
}
}
return urlList;
}
void BrowserService::hideWindow() const
{
if (m_prevWindowState == WindowState::Minimized) {

2
src/browser/BrowserService.h
View file

@ -159,7 +159,7 @@ private:
QSharedPointer<Database> selectedDatabase();
QString getDatabaseRootUuid();
QString getDatabaseRecycleBinUuid();
QStringList getEntryURLs(const Entry* entry);
bool checkLegacySettings(QSharedPointer<Database> db);
void hideWindow() const;
void raiseWindow(const bool force = false);
void updateWindowState();

8
src/core/Entry.cpp
View file

@ -372,16 +372,18 @@ QString Entry::url() const
QStringList Entry::getAllUrls() const
{
QStringList urlList;
auto entryUrl = url();
if (!url().isEmpty()) {
urlList << url();
if (!entryUrl.isEmpty()) {
urlList << (EntryAttributes::matchReference(entryUrl).hasMatch() ? resolveMultiplePlaceholders(entryUrl)
: entryUrl);
}
for (const auto& key : m_attributes->keys()) {
if (key.startsWith("KP2A_URL")) {
auto additionalUrl = m_attributes->value(key);
if (!additionalUrl.isEmpty()) {
urlList << additionalUrl;
urlList << resolveMultiplePlaceholders(additionalUrl);
}
}
}