1 files changed, 6 insertions, 38 deletions

diff --git a/src/browser/BrowserAction.h b/src/browser/BrowserAction.h
index a8af0915e..c65409dd8 100644
--- a/src/browser/BrowserAction.h
+++ b/src/browser/BrowserAction.h
@@ -1,6 +1,5 @@
 /*
- *  Copyright (C) 2017 Sami Vänttinen <sami.vanttinen@protonmail.com>
- *  Copyright (C) 2017 KeePassXC Team <team@keepassxc.org>
+ *  Copyright (C) 2020 KeePassXC Team <team@keepassxc.org>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -19,42 +18,16 @@
 #ifndef BROWSERACTION_H
 #define BROWSERACTION_H
 
-#include "BrowserService.h"
 #include <QJsonObject>
-#include <QMutex>
-#include <QObject>
-#include <QtCore>
+#include <QString>
 
-class BrowserAction : public QObject
+class BrowserAction
 {
-    Q_OBJECT
-
-    enum
-    {
-        ERROR_KEEPASS_DATABASE_NOT_OPENED = 1,
-        ERROR_KEEPASS_DATABASE_HASH_NOT_RECEIVED = 2,
-        ERROR_KEEPASS_CLIENT_PUBLIC_KEY_NOT_RECEIVED = 3,
-        ERROR_KEEPASS_CANNOT_DECRYPT_MESSAGE = 4,
-        ERROR_KEEPASS_TIMEOUT_OR_NOT_CONNECTED = 5,
-        ERROR_KEEPASS_ACTION_CANCELLED_OR_DENIED = 6,
-        ERROR_KEEPASS_CANNOT_ENCRYPT_MESSAGE = 7,
-        ERROR_KEEPASS_ASSOCIATION_FAILED = 8,
-        ERROR_KEEPASS_KEY_CHANGE_FAILED = 9,
-        ERROR_KEEPASS_ENCRYPTION_KEY_UNRECOGNIZED = 10,
-        ERROR_KEEPASS_NO_SAVED_DATABASES_FOUND = 11,
-        ERROR_KEEPASS_INCORRECT_ACTION = 12,
-        ERROR_KEEPASS_EMPTY_MESSAGE_RECEIVED = 13,
-        ERROR_KEEPASS_NO_URL_PROVIDED = 14,
-        ERROR_KEEPASS_NO_LOGINS_FOUND = 15,
-        ERROR_KEEPASS_NO_GROUPS_FOUND = 16,
-        ERROR_KEEPASS_CANNOT_CREATE_NEW_GROUP = 17
-    };
-
 public:
-    BrowserAction(BrowserService& browserService);
+    explicit BrowserAction() = default;
     ~BrowserAction() = default;
 
-    QJsonObject readResponse(const QJsonObject& json);
+    QJsonObject processClientMessage(const QJsonObject& json);
 
 private:
     QJsonObject handleAction(const QJsonObject& json);
@@ -73,9 +46,6 @@ private:
     QJsonObject buildResponse(const QString& action, const QJsonObject& message, const QString& nonce);
     QJsonObject getErrorReply(const QString& action, const int errorCode) const;
     QString getErrorMessage(const int errorCode) const;
-    QString getReturnValue(const BrowserService::ReturnValue returnValue) const;
-    QString getDatabaseHash();
-    QString getLegacyDatabaseHash();
 
     QString encryptMessage(const QJsonObject& message, const QString& nonce);
     QJsonObject decryptMessage(const QString& message, const QString& nonce);
@@ -90,12 +60,10 @@ private:
     QString incrementNonce(const QString& nonce);
 
 private:
-    QMutex m_mutex;
-    BrowserService& m_browserService;
     QString m_clientPublicKey;
     QString m_publicKey;
     QString m_secretKey;
-    bool m_associated;
+    bool m_associated = false;
 
     friend class TestBrowser;
 };