Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-03-13 01:26:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix renaming extension key name in Database Settings

Browse Source
This commit is contained in:
Jonathan White 2025-01-03 18:17:07 -05:00
parent 84b064b743
commit 2364e4cd4a
No known key found for this signature in database
GPG Key ID: 440FC65F2E0C6E01
4 changed files with 32 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/browser/BrowserService.cpp
View File

@ -614,8 +614,8 @@ QString BrowserService::storeKey(const QString& key)
hideWindow();
db->metadata()->customData()->set(CustomData::BrowserKeyPrefix + id, key);
db->metadata()->customData()->set(QString("%1_%2").arg(CustomData::Created, id),
Clock::currentDateTime().toString(Qt::SystemLocaleShortDate));
db->metadata()->customData()->set(QString("%1%2").arg(CustomData::Created, id),
QLocale::system().toString(Clock::currentDateTime(), QLocale::ShortFormat));
return id;
}

4
src/core/CustomData.cpp
View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 2018 KeePassXC Team <team@keepassxc.org>
* Copyright (C) 2024 KeePassXC Team <team@keepassxc.org>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -21,7 +21,7 @@
#include "core/Global.h"
const QString CustomData::LastModified = QStringLiteral("_LAST_MODIFIED");
const QString CustomData::Created = QStringLiteral("_CREATED");
const QString CustomData::Created = QStringLiteral("_CREATED_");
const QString CustomData::BrowserKeyPrefix = QStringLiteral("KPXC_BROWSER_");
const QString CustomData::BrowserLegacyKeyPrefix = QStringLiteral("Public Key: ");
const QString CustomData::ExcludeFromReportsLegacy = QStringLiteral("KnownBad");

35
src/gui/dbsettings/DatabaseSettingsWidgetBrowser.cpp
View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 2018 KeePassXC Team <team@keepassxc.org>
* Copyright (C) 2024 KeePassXC Team <team@keepassxc.org>
* Copyright (C) 2018 Sami Vänttinen <sami.vanttinen@protonmail.com>
*
* This program is free software: you can redistribute it and/or modify
@ -126,7 +126,7 @@ void DatabaseSettingsWidgetBrowser::updateModel()
if (key.startsWith(CustomData::BrowserKeyPrefix)) {
QString strippedKey = key;
strippedKey.remove(CustomData::BrowserKeyPrefix);
auto created = customData()->value(QString("%1_%2").arg(CustomData::Created, strippedKey));
auto created = customData()->value(getKeyWithPrefix(CustomData::Created, strippedKey));
auto createdItem = new QStandardItem(created);
createdItem->setEditable(false);
m_customDataModel->appendRow(QList<QStandardItem*>()
@ -287,18 +287,16 @@ void DatabaseSettingsWidgetBrowser::editFinished(QStandardItem* item)
if (itemSelectionModel) {
auto indexList = itemSelectionModel->selectedRows(item->column());
if (indexList.length() > 0) {
QString newValue = item->index().data().toString();
if (!indexList.isEmpty()) {
auto newValue = item->index().data().toString();
// The key is edited
if (item->column() == 0) {
// Get the old key/value pair, remove it and replace it
m_valueInEdit.insert(0, CustomData::BrowserKeyPrefix);
auto tempValue = customData()->value(m_valueInEdit);
newValue.insert(0, CustomData::BrowserKeyPrefix);
// Update created timestamp with the new key
replaceKey(CustomData::Created, m_valueInEdit, newValue);
m_db->metadata()->customData()->remove(m_valueInEdit);
m_db->metadata()->customData()->set(newValue, tempValue);
// Get the old key/value pair, remove it and replace it
replaceKey(CustomData::BrowserKeyPrefix, m_valueInEdit, newValue);
} else {
// Replace just the value
for (const QString& key : m_db->metadata()->customData()->keys()) {
@ -321,3 +319,20 @@ void DatabaseSettingsWidgetBrowser::updateSharedKeyList()
{
updateModel();
}
// Replaces a key and the created timestamp for it
void DatabaseSettingsWidgetBrowser::replaceKey(const QString& prefix,
const QString& oldName,
const QString& newName) const
{
const auto oldKey = getKeyWithPrefix(prefix, oldName);
const auto newKey = getKeyWithPrefix(prefix, newName);
const auto tempValue = customData()->value(oldKey);
m_db->metadata()->customData()->remove(oldKey);
m_db->metadata()->customData()->set(newKey, tempValue);
}
QString DatabaseSettingsWidgetBrowser::getKeyWithPrefix(const QString& prefix, const QString& key) const
{
return QString("%1%2").arg(prefix, key);
}

4
src/gui/dbsettings/DatabaseSettingsWidgetBrowser.h
View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 2018 KeePassXC Team <team@keepassxc.org>
* Copyright (C) 2024 KeePassXC Team <team@keepassxc.org>
* Copyright (C) 2018 Sami Vänttinen <sami.vanttinen@protonmail.com>
*
* This program is free software: you can redistribute it and/or modify
@ -63,6 +63,8 @@ private slots:
private:
void updateModel();
void settingsWarning();
void replaceKey(const QString& prefix, const QString& oldName, const QString& newName) const;
QString getKeyWithPrefix(const QString& prefix, const QString& key) const;
protected:
void showEvent(QShowEvent* event) override;