jacobpascual/keepassxc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source 
Conflicts:
	src/CMakeLists.txt
	src/autotype/xcb/AutoTypeXCB.cpp
	src/browser/BrowserAction.cpp
	src/browser/BrowserService.cpp
	src/browser/BrowserService.h
	src/browser/BrowserSettings.h
	src/browser/NativeMessagingHost.cpp
	src/browser/NativeMessagingHost.h
	src/gui/EditWidgetIcons.cpp
	src/gui/EditWidgetIcons.h
	src/gui/MainWindow.cpp
	src/proxy/NativeMessagingHost.cpp
	tests/TestOpenSSHKey.cpp
This commit is contained in:
Jonathan White
2018-05-07 23:22:59 -04:00
parent 5c7aaf5754 2bb72eba02
commit aae6d09fd3
53 changed files with 9771 additions and 1125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/browser/BrowserService.h
View File

@@ -25,6 +25,9 @@
#include <QObject>
#include <QtCore>
typedef QPair<QString, QString> StringPair;
typedef QList<StringPair> StringPairList;
enum
{
max_length = 16 * 1024
@@ -50,13 +53,16 @@ public:
const QString& submitUrl,
const QString& realm);
QList<Entry*> searchEntries(Database* db, const QString& hostname);
QList<Entry*> searchEntries(const QString& text);
QList<Entry*> searchEntries(const QString& text, const StringPairList& keyList);
void removeSharedEncryptionKeys();
void removeStoredPermissions();
public slots:
QJsonArray
findMatchingEntries(const QString& id, const QString& url, const QString& submitUrl, const QString& realm);
QJsonArray findMatchingEntries(const QString& id,
const QString& url,
const QString& submitUrl,
const QString& realm,
const StringPairList& keyList);
QString storeKey(const QString& key);
void updateEntry(const QString& id,
const QString& uuid,
@@ -100,6 +106,7 @@ private:
private:
DatabaseTabWidget* const m_dbTabWidget;
bool m_dialogActive;
bool m_bringToFrontRequested;
};
#endif // BROWSERSERVICE_H