Small fixes

keepassxreboot · Sep 2, 2024 · c57cd46 · c57cd46
1 parent f2d942a
commit c57cd46
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 8 deletions.
diff --git a/share/translations/keepassxc_en.ts b/share/translations/keepassxc_en.ts
@@ -8902,17 +8902,17 @@ This option is deprecated, use --set-key-file instead.</source>
         <source>Cannot generate valid passphrases because the wordlist is too short</source>
         <translation type="unfinished"></translation>
     </message>
-    <message numerus="yes">
+    <message>
         <source>Delete plugin data?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message numerus="yes">
+        <source>Delete plugin data from Entry(s)?</source>
         <translation type="unfinished">
             <numerusform></numerusform>
             <numerusform></numerusform>
         </translation>
     </message>
-    <message>
-        <source>Delete plugin data from Entry(s)?</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>QtIOCompressor</name>

diff --git a/src/browser/BrowserService.cpp b/src/browser/BrowserService.cpp
@@ -977,6 +977,15 @@ bool BrowserService::deleteEntry(const QString& uuid)
     return true;
 }
 
+void BrowserService::removePluginData(Entry* entry) const
+{
+    if (!entry) {
+        return;
+    }
+
+    entry->customData()->remove(BrowserService::KEEPASSXCBROWSER_NAME);
+}
+
 QList<Entry*> BrowserService::searchEntries(const QSharedPointer<Database>& db,
                                             const QString& siteUrl,
                                             const QString& formUrl,

diff --git a/src/browser/BrowserService.h b/src/browser/BrowserService.h
@@ -118,6 +118,7 @@ class BrowserService : public QObject
                   const QSharedPointer<Database>& selectedDb = {});
     bool updateEntry(const EntryParameters& entryParameters, const QString& uuid);
     bool deleteEntry(const QString& uuid);
+    void removePluginData(Entry* entry) const;
     QJsonArray findEntries(const EntryParameters& entryParameters, const StringPairList& keyList, bool* entriesFound);
     void requestGlobalAutoType(const QString& search);
 

diff --git a/src/gui/GuiTools.cpp b/src/gui/GuiTools.cpp
@@ -73,8 +73,8 @@ namespace GuiTools
         }
 
         auto answer = MessageBox::question(parent,
-                                           QObject::tr("Delete plugin data?", "", entries.size()),
-                                           QObject::tr("Delete plugin data from Entry(s)?"),
+                                           QObject::tr("Delete plugin data?"),
+                                           QObject::tr("Delete plugin data from Entry(s)?", "", entries.size()),
                                            MessageBox::Delete | MessageBox::Cancel,
                                            MessageBox::Cancel);
 

diff --git a/src/gui/dbsettings/DatabaseSettingsWidgetBrowser.cpp b/src/gui/dbsettings/DatabaseSettingsWidgetBrowser.cpp
@@ -215,7 +215,7 @@ void DatabaseSettingsWidgetBrowser::removeStoredPermissions()
 
         if (entry->customData()->contains(BrowserService::KEEPASSXCBROWSER_NAME)) {
             entry->beginUpdate();
-            entry->customData()->remove(BrowserService::KEEPASSXCBROWSER_NAME);
+            browserService()->removePluginData(entry);
             entry->endUpdate();
             ++counter;
         }

diff --git a/src/gui/reports/ReportsWidgetBrowserStatistics.cpp b/src/gui/reports/ReportsWidgetBrowserStatistics.cpp
@@ -345,6 +345,7 @@ void ReportsWidgetBrowserStatistics::deletePluginDataFromSelectedEntries()
     if (GuiTools::confirmDeletePluginData(this, selectedEntries)) {
         for (auto& entry : selectedEntries) {
             entry->customData()->remove(BrowserService::KEEPASSXCBROWSER_NAME);
+            browserService()->removePluginData(entry);
         }
     }