all fields are protected

TheZ3ro · TheZ3ro · commit a4f79232ff0a · 2018-05-29T22:56:15.000+02:00
diff --git a/src/gui/Clipboard.cpp b/src/gui/Clipboard.cpp
@@ -1,4 +1,5 @@
 /*
+ *  Copyright (C) 2017 KeePassXC Team <team@keepassxc.org>
  *  Copyright (C) 2012 Felix Geyer <debfx@fobos.de>
  *
  *  This program is free software: you can redistribute it and/or modify
@@ -43,7 +44,7 @@ Clipboard::Clipboard(QObject* parent)
     connect(qApp, SIGNAL(aboutToQuit()), SLOT(clearCopiedText()));
 }
 
-void Clipboard::setText(const QString& text, bool secret)
+void Clipboard::setText(const QString& text)
 {
     QClipboard* clipboard = QApplication::clipboard();
 
@@ -53,24 +54,14 @@ void Clipboard::setText(const QString& text, bool secret)
     mime->setData("application/x-nspasteboard-concealed-type", text.toUtf8());
     clipboard->setMimeData(mime, QClipboard::Clipboard);
 #else
-    if (secret) {
-        const QString secretStr = "secret";
-        QByteArray secretBa = secretStr.toUtf8();
-        mime->setText(text);
-        mime->setData("x-kde-passwordManagerHint", secretBa);
-        clipboard->setMimeData(mime, QClipboard::Clipboard);
-
-        if (clipboard->supportsSelection()) {
-            QMimeData* mimeSelection = new QMimeData();
-            mimeSelection->setText(text);
-            mimeSelection->setData("x-kde-passwordManagerHint", secretBa);
-            clipboard->setMimeData(mimeSelection, QClipboard::Selection);
-        }
-    } else {
-        clipboard->setText(text, QClipboard::Clipboard);
-        if (clipboard->supportsSelection()) {
-            clipboard->setText(text, QClipboard::Selection);
-        }
+    const QString secretStr = "secret";
+    QByteArray secretBa = secretStr.toUtf8();
+    mime->setText(text);
+    mime->setData("x-kde-passwordManagerHint", secretBa);
+    clipboard->setMimeData(mime, QClipboard::Clipboard);
+
+    if (clipboard->supportsSelection()) {
+        clipboard->setMimeData(mime, QClipboard::Selection);
     }
 #endif
 
@@ -83,11 +74,6 @@ void Clipboard::setText(const QString& text, bool secret)
     }
 }
 
-void Clipboard::setSecretText(const QString& text)
-{
-    setText(text, true);
-}
-
 void Clipboard::clearCopiedText()
 {
     if (m_timer->isActive()) {
diff --git a/src/gui/Clipboard.h b/src/gui/Clipboard.h
@@ -1,4 +1,5 @@
 /*
+ *  Copyright (C) 2017 KeePassXC Team <team@keepassxc.org>
  *  Copyright (C) 2012 Felix Geyer <debfx@fobos.de>
  *
  *  This program is free software: you can redistribute it and/or modify
@@ -31,8 +32,7 @@ class Clipboard : public QObject
     Q_OBJECT
 
 public:
-    void setText(const QString& text, bool secret = false);
-    void setSecretText(const QString& text);
+    void setText(const QString& text);
 
     static Clipboard* instance();
 
diff --git a/src/gui/DatabaseWidget.cpp b/src/gui/DatabaseWidget.cpp
@@ -548,7 +548,7 @@ void DatabaseWidget::copyPassword()
         return;
     }
 
-    setClipboardSecretTextAndMinimize(currentEntry->resolveMultiplePlaceholders(currentEntry->password()));
+    setClipboardTextAndMinimize(currentEntry->resolveMultiplePlaceholders(currentEntry->password()));
 }
 
 void DatabaseWidget::copyURL()
@@ -593,14 +593,6 @@ void DatabaseWidget::setClipboardTextAndMinimize(const QString& text)
     }
 }
 
-void DatabaseWidget::setClipboardSecretTextAndMinimize(const QString& text)
-{
-    clipboard()->setSecretText(text);
-    if (config()->get("MinimizeOnCopy").toBool()) {
-        window()->showMinimized();
-    }
-}
-
 void DatabaseWidget::performAutoType()
 {
     Entry* currentEntry = m_entryView->currentEntry();
@@ -941,7 +933,7 @@ void DatabaseWidget::entryActivationSignalReceived(Entry* entry, EntryModel::Mod
         setClipboardTextAndMinimize(entry->resolveMultiplePlaceholders(entry->username()));
         break;
     case EntryModel::Password:
-        setClipboardSecretTextAndMinimize(entry->resolveMultiplePlaceholders(entry->password()));
+        setClipboardTextAndMinimize(entry->resolveMultiplePlaceholders(entry->password()));
         break;
     case EntryModel::Url:
         if (!entry->url().isEmpty()) {
diff --git a/src/gui/DatabaseWidget.h b/src/gui/DatabaseWidget.h
@@ -209,7 +209,6 @@ private slots:
 
 private:
     void setClipboardTextAndMinimize(const QString& text);
-    void setClipboardSecretTextAndMinimize(const QString& text);
     void setIconFromParent();
     void replaceDatabase(Database* db);
 

Original file line number	Diff line number	Diff line change
`@@ -548,7 +548,7 @@ void DatabaseWidget::copyPassword()`
`548`	`548`	`return;`
`549`	`549`	`}`
`550`	`550`
`551`		`- setClipboardSecretTextAndMinimize(currentEntry->resolveMultiplePlaceholders(currentEntry->password()));`
	`551`	`+ setClipboardTextAndMinimize(currentEntry->resolveMultiplePlaceholders(currentEntry->password()));`
`552`	`552`	`}`
`553`	`553`
`554`	`554`	`void DatabaseWidget::copyURL()`
`@@ -593,14 +593,6 @@ void DatabaseWidget::setClipboardTextAndMinimize(const QString& text)`
`593`	`593`	`}`
`594`	`594`	`}`
`595`	`595`
`596`		`-void DatabaseWidget::setClipboardSecretTextAndMinimize(const QString& text)`
`597`		`-{`
`598`		`- clipboard()->setSecretText(text);`
`599`		`- if (config()->get("MinimizeOnCopy").toBool()) {`
`600`		`- window()->showMinimized();`
`601`		`- }`
`602`		`-}`
`603`		`-`
`604`	`596`	`void DatabaseWidget::performAutoType()`
`605`	`597`	`{`
`606`	`598`	`Entry* currentEntry = m_entryView->currentEntry();`
`@@ -941,7 +933,7 @@ void DatabaseWidget::entryActivationSignalReceived(Entry* entry, EntryModel::Mod`
`941`	`933`	`setClipboardTextAndMinimize(entry->resolveMultiplePlaceholders(entry->username()));`
`942`	`934`	`break;`
`943`	`935`	`case EntryModel::Password:`
`944`		`- setClipboardSecretTextAndMinimize(entry->resolveMultiplePlaceholders(entry->password()));`
	`936`	`+ setClipboardTextAndMinimize(entry->resolveMultiplePlaceholders(entry->password()));`
`945`	`937`	`break;`
`946`	`938`	`case EntryModel::Url:`
`947`	`939`	`if (!entry->url().isEmpty()) {`