Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-07-29 09:38:48 -04:00
Code Issues Projects Releases Packages Wiki Activity

Disable creating the default group

Browse source
This commit is contained in:
varjolintu 2019-05-07 10:51:24 +03:00 • committed by Jonathan White
parent ecaa4fd6ce
commit 7ce6f9d3b1
2 changed files with 8 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/browser/BrowserService.cpp
View file

@ -453,11 +453,6 @@ void BrowserService::addEntry(const QString& id,
return; return;
} }
auto* addEntryGroup = findCreateAddEntryGroup(db);
if (!addEntryGroup) {
return;
}
auto* entry = new Entry(); auto* entry = new Entry();
entry->setUuid(QUuid::createUuid()); entry->setUuid(QUuid::createUuid());
entry->setTitle(QUrl(url).host()); entry->setTitle(QUrl(url).host());
@ -465,16 +460,19 @@ void BrowserService::addEntry(const QString& id,
entry->setIcon(KEEPASSXCBROWSER_DEFAULT_ICON); entry->setIcon(KEEPASSXCBROWSER_DEFAULT_ICON);
entry->setUsername(login); entry->setUsername(login);
entry->setPassword(password); entry->setPassword(password);
entry->setGroup(addEntryGroup);
// Select a group for the entry // Select a group for the entry
if (!group.isEmpty()) { if (!group.isEmpty()) {
if (db->rootGroup()) { if (db->rootGroup()) {
auto selectedGroup = db->rootGroup()->findGroupByUuid(Tools::hexToUuid(groupUuid)); auto selectedGroup = db->rootGroup()->findGroupByUuid(Tools::hexToUuid(groupUuid));
if (selectedGroup && selectedGroup->name() == group) { if (selectedGroup) {
entry->setGroup(selectedGroup); entry->setGroup(selectedGroup);
} else {
entry->setGroup(getDefaultEntryGroup(db));
} }
} }
} else {
entry->setGroup(getDefaultEntryGroup(db));
} }
const QString host = QUrl(url).host(); const QString host = QUrl(url).host();
@ -859,7 +857,7 @@ BrowserService::checkAccess(const Entry* entry, const QString& host, const QStri
return Unknown; return Unknown;
} }
Group* BrowserService::findCreateAddEntryGroup(const QSharedPointer<Database>& selectedDb) Group* BrowserService::getDefaultEntryGroup(const QSharedPointer<Database>& selectedDb)
{ {
auto db = selectedDb ? selectedDb : getDatabase(); auto db = selectedDb ? selectedDb : getDatabase();
if (!db) { if (!db) {
@ -872,7 +870,7 @@ Group* BrowserService::findCreateAddEntryGroup(const QSharedPointer<Database>& s
} }
const QString groupName = const QString groupName =
QLatin1String(KEEPASSXCBROWSER_GROUP_NAME); // TODO: setting to decide where new keys are created QLatin1String(KEEPASSXCBROWSER_GROUP_NAME);
for (auto* g : rootGroup->groupsRecursive(true)) { for (auto* g : rootGroup->groupsRecursive(true)) {
if (g->name() == groupName && !g->isRecycled()) { if (g->name() == groupName && !g->isRecycled()) {

2
src/browser/BrowserService.h
View file

@ -114,7 +114,7 @@ private:
const QString& realm); const QString& realm);
QJsonObject prepareEntry(const Entry* entry); QJsonObject prepareEntry(const Entry* entry);
Access checkAccess(const Entry* entry, const QString& host, const QString& submitHost, const QString& realm); Access checkAccess(const Entry* entry, const QString& host, const QString& submitHost, const QString& realm);
Group* findCreateAddEntryGroup(const QSharedPointer<Database>& selectedDb = {}); Group* getDefaultEntryGroup(const QSharedPointer<Database>& selectedDb = {});
int int
sortPriority(const Entry* entry, const QString& host, const QString& submitUrl, const QString& baseSubmitUrl) const; sortPriority(const Entry* entry, const QString& host, const QString& submitUrl, const QString& baseSubmitUrl) const;
bool matchUrlScheme(const QString& url); bool matchUrlScheme(const QString& url);