From 91bccf75d5b7b8f645736b55e97a5c4c43a8ca76 Mon Sep 17 00:00:00 2001
From: varjolintu <sami.vanttinen@protonmail.com>
Date: Thu, 1 Nov 2018 13:07:51 +0200
Subject: [PATCH] Include older settings type to conversion

---
 src/browser/BrowserService.cpp | 10 ++++++++--
 src/browser/BrowserService.h   |  1 +
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/browser/BrowserService.cpp b/src/browser/BrowserService.cpp
index cca76c15f..a69508026 100644
--- a/src/browser/BrowserService.cpp
+++ b/src/browser/BrowserService.cpp
@@ -36,6 +36,7 @@
 #include "gui/MainWindow.h"
 
 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_";
 static const char KEEPASSXCBROWSER_GROUP_NAME[] = "KeePassXC-Browser Passwords";
 static int KEEPASSXCBROWSER_DEFAULT_ICON = 1;
@@ -467,11 +468,16 @@ void BrowserService::convertAttributesToCustomData(Database *currentDb)
         if (moveSettingsToCustomData(entry, KEEPASSHTTP_NAME)) {
             ++counter;
         }
+
+        if (moveSettingsToCustomData(entry, KEEPASSXCBROWSER_OLD_NAME)) {
+            ++counter;
+        }
+
         if (moveSettingsToCustomData(entry, KEEPASSXCBROWSER_NAME)) {
             ++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);
             delete entry;
         }
@@ -860,7 +866,7 @@ bool BrowserService::checkLegacySettings()
     QList<Entry*> entries = db->rootGroup()->entriesRecursive();
     for (const auto& e : entries) {
         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;
             break;
         }
diff --git a/src/browser/BrowserService.h b/src/browser/BrowserService.h
index 482bf99cb..bf93edf72 100644
--- a/src/browser/BrowserService.h
+++ b/src/browser/BrowserService.h
@@ -59,6 +59,7 @@ public:
 
 public:
     static const char KEEPASSXCBROWSER_NAME[];
+    static const char KEEPASSXCBROWSER_OLD_NAME[];
     static const char ASSOCIATE_KEY_PREFIX[];
     static const char LEGACY_ASSOCIATE_KEY_PREFIX[];