Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-02-09 03:08:32 -05:00
Code Issues Packages Projects Releases Wiki Activity

Include older settings type to conversion

Browse Source
This commit is contained in:
varjolintu 2018-11-01 13:07:51 +02:00 committed by Jonathan White
parent c339470496
commit 91bccf75d5
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/browser/BrowserService.cpp
View File

@ -36,6 +36,7 @@
#include "gui/MainWindow.h" #include "gui/MainWindow.h"
const char BrowserService::KEEPASSXCBROWSER_NAME[] = "KeePassXC-Browser Settings"; const char BrowserService::KEEPASSXCBROWSER_NAME[] = "KeePassXC-Browser Settings";
const char BrowserService::KEEPASSXCBROWSER_OLD_NAME[] = "keepassxc-browser Settings";
const char BrowserService::ASSOCIATE_KEY_PREFIX[] = "KPXC_BROWSER_"; const char BrowserService::ASSOCIATE_KEY_PREFIX[] = "KPXC_BROWSER_";
static const char KEEPASSXCBROWSER_GROUP_NAME[] = "KeePassXC-Browser Passwords"; static const char KEEPASSXCBROWSER_GROUP_NAME[] = "KeePassXC-Browser Passwords";
static int KEEPASSXCBROWSER_DEFAULT_ICON = 1; static int KEEPASSXCBROWSER_DEFAULT_ICON = 1;
@ -467,11 +468,16 @@ void BrowserService::convertAttributesToCustomData(Database *currentDb)
if (moveSettingsToCustomData(entry, KEEPASSHTTP_NAME)) { if (moveSettingsToCustomData(entry, KEEPASSHTTP_NAME)) {
++counter; ++counter;
} }
if (moveSettingsToCustomData(entry, KEEPASSXCBROWSER_OLD_NAME)) {
++counter;
}
if (moveSettingsToCustomData(entry, KEEPASSXCBROWSER_NAME)) { if (moveSettingsToCustomData(entry, KEEPASSXCBROWSER_NAME)) {
++counter; ++counter;
} }
if (entry->title() == KEEPASSHTTP_NAME || entry->title() == KEEPASSXCBROWSER_NAME) { if (entry->title() == KEEPASSHTTP_NAME || entry->title().contains(KEEPASSXCBROWSER_NAME, Qt::CaseInsensitive)) {
keyCounter += moveKeysToCustomData(entry, db); keyCounter += moveKeysToCustomData(entry, db);
delete entry; delete entry;
} }
@ -860,7 +866,7 @@ bool BrowserService::checkLegacySettings()
QList<Entry*> entries = db->rootGroup()->entriesRecursive(); QList<Entry*> entries = db->rootGroup()->entriesRecursive();
for (const auto& e : entries) { for (const auto& e : entries) {
if ((e->attributes()->contains(KEEPASSHTTP_NAME) || e->attributes()->contains(KEEPASSXCBROWSER_NAME)) || if ((e->attributes()->contains(KEEPASSHTTP_NAME) || e->attributes()->contains(KEEPASSXCBROWSER_NAME)) ||
(e->title() == KEEPASSHTTP_NAME || e->title() == KEEPASSXCBROWSER_NAME)) { (e->title() == KEEPASSHTTP_NAME || e->title().contains(KEEPASSXCBROWSER_NAME, Qt::CaseInsensitive))) {
legacySettingsFound = true; legacySettingsFound = true;
break; break;
} }

1
src/browser/BrowserService.h
View File

@ -59,6 +59,7 @@ public:
public: public:
static const char KEEPASSXCBROWSER_NAME[]; static const char KEEPASSXCBROWSER_NAME[];
static const char KEEPASSXCBROWSER_OLD_NAME[];
static const char ASSOCIATE_KEY_PREFIX[]; static const char ASSOCIATE_KEY_PREFIX[];
static const char LEGACY_ASSOCIATE_KEY_PREFIX[]; static const char LEGACY_ASSOCIATE_KEY_PREFIX[];