Corrected formatting and cleanup

INSTALL.md

@@ -27,7 +27,6 @@ The following libraries are required:
 * libxi, libxtst, qtx11extras (optional for auto-type on X11)
 * libsodium (>= 1.0.12, optional for KeePassXC-Browser support)
 * libargon2
-* libquazip5
 
 Prepare the Building Environment
 ================================
@@ -100,10 +99,12 @@ These steps place the compiled KeePassXC binary inside the `./build/src/` direct
 	  -DWITH_XC_BROWSER=[ON|OFF] Enable/Disable KeePassXC-Browser extension support (default: OFF)
 	  -DWITH_XC_NETWORKING=[ON|OFF] Enable/Disable Networking support (favicon download) (default: OFF)
 	  -DWITH_XC_SSHAGENT=[ON|OFF] Enable/Disable SSHAgent support (default: OFF)
-	  -DWITH_XC_SHARING=[ON|OFF] Enable/Disable Sharing extension (default: OFF)
+	  -DWITH_XC_KEESHARE=[ON|OFF] Enable/Disable KeeShare group syncronization extension (default: OFF)
 	  -DWITH_XC_TOUCHID=[ON|OFF] (macOS Only) Enable/Disable Touch ID unlock (default:OFF)
 	  -DWITH_XC_ALL=[ON|OFF] Enable/Disable compiling all plugins above (default: OFF)
 	  
+	  -DWITH_XC_KEESHARE_SECURE=[ON|OFF] Enable/Disable KeeShare secure containers, requires libquazip5 (default: OFF)
+	  
 	  -DWITH_TESTS=[ON|OFF] Enable/Disable building of unit tests (default: ON)
 	  -DWITH_GUI_TESTS=[ON|OFF] Enable/Disable building of GUI tests (default: OFF)
 	  -DWITH_DEV_BUILD=[ON|OFF] Enable/Disable deprecated method warnings (default: OFF)

README.md

@@ -1,10 +1,6 @@
 # <img src="https://keepassxc.org/logo.png" width="40" height="40"/> KeePassXC
 [![TeamCity Build Status](https://ci.keepassxc.org/app/rest/builds/buildType:\(project:KeepassXC\)/statusIcon)](https://ci.keepassxc.org/?guest=1) [![codecov](https://codecov.io/gh/keepassxreboot/keepassxc/branch/develop/graph/badge.svg)](https://codecov.io/gh/keepassxreboot/keepassxc)
 
-
-## Note
-This is a feature fork to introduce the concept of Sharing to KeepPassXC. See [Using Sharing](./docs/QUICKSTART.md#using-sharing) for more details.
-
 ## About KeePassXC
 [KeePassXC](https://keepassxc.org) is a cross-platform community fork of
 [KeePassX](https://www.keepassx.org/).
@@ -38,7 +34,7 @@ so please check out your distribution's package list to see if KeePassXC is avai
 [Google Chrome or Chromium](https://chrome.google.com/webstore/detail/keepasshttp-connector/dafgdjggglmmknipkhngniifhplpcldb), and
 [passafari](https://github.com/mmichaa/passafari.safariextension/) in Safari. [[See note about KeePassHTTP]](#note-about-keepasshttp)
 - Browser integration with KeePassXC-Browser using [native messaging](https://developer.chrome.com/extensions/nativeMessaging) for [Mozilla Firefox](https://addons.mozilla.org/en-US/firefox/addon/keepassxc-browser/) and [Google Chrome or Chromium](https://chrome.google.com/webstore/detail/keepassxc-browser/oboonakemofpalcgghocfoadofidjkkk)
-- Sharing of passwords using KeeShare. See [Using Sharing](./docs/QUICKSTART.md#using-sharing) for more details.
+- Synchronize passwords using KeeShare. See [Using Sharing](./docs/QUICKSTART.md#using-sharing) for more details.
 - Many bug fixes
 
 For a full list of features and changes, read the [CHANGELOG](CHANGELOG) document.

cmake/FindQuaZip.cmake

@@ -4,7 +4,6 @@
 # QUAZIP_LIBRARIES           - List of QuaZip libraries
 # QUAZIP_ZLIB_INCLUDE_DIR    - The include dir of zlib headers
 
-
 IF(QUAZIP_INCLUDE_DIRS AND QUAZIP_LIBRARIES)
   # in cache already
   SET(QUAZIP_FOUND TRUE)
@@ -24,7 +23,6 @@ ELSE (QUAZIP_INCLUDE_DIRS AND QUAZIP_LIBRARIES)
     FIND_PATH(QUAZIP_ZLIB_INCLUDE_DIR NAMES zlib.h)
   ELSE(WIN32)
     FIND_PACKAGE(PkgConfig)
-#     pkg_check_modules(PC_QCA2 QUIET qca2)
     pkg_check_modules(PC_QUAZIP quazip)
     FIND_LIBRARY(QUAZIP_LIBRARIES
       WIN32_DEBUG_POSTFIX d

snapcraft.yaml

@@ -50,8 +50,6 @@ parts:
       - libsodium-dev
       - libargon2-0-dev
       - libqrencode-dev
-      - libquazip5-dev
-      - libquazip5-headers
     stage-packages:
       - dbus
       - qttranslations5-l10n # common translations

src/core/Database.cpp

@@ -476,7 +476,7 @@ bool Database::challengeMasterSeed(const QByteArray& masterSeed)
         m_data.masterSeed = masterSeed;
         return m_data.key->challenge(masterSeed, m_data.challengeResponseKey);
     }
-    return true;
+    return false;
 }
 
 void Database::setCipher(const QUuid& cipher)

src/crypto/CryptoHash.h

@@ -34,7 +34,6 @@ public:
     explicit CryptoHash(Algorithm algo, bool hmac = false);
     ~CryptoHash();
     void addData(const QByteArray& data);
-    void reset();
     QByteArray result() const;
     void setKey(const QByteArray& data);
 

src/gui/EntryPreviewWidget.cpp

@@ -30,8 +30,7 @@
 #include "keeshare/KeeShare.h"
 #endif
 
-namespace
+namespace {
-{
 constexpr int GeneralTabIndex = 0;
 }
 

src/gui/MainWindow.cpp

@@ -20,8 +20,8 @@
 #include "ui_MainWindow.h"
 
 #include <QCloseEvent>
-#include <QFileInfo>
 #include <QDesktopServices>
+#include <QFileInfo>
 #include <QMimeData>
 #include <QShortcut>
 #include <QTimer>
@@ -33,12 +33,12 @@
 #include "core/FilePath.h"
 #include "core/InactivityTimer.h"
 #include "core/Metadata.h"
-#include "keys/CompositeKey.h"
-#include "keys/PasswordKey.h"
-#include "keys/FileKey.h"
 #include "gui/AboutDialog.h"
 #include "gui/DatabaseWidget.h"
 #include "gui/SearchWidget.h"
+#include "keys/CompositeKey.h"
+#include "keys/FileKey.h"
+#include "keys/PasswordKey.h"
 
 #ifdef WITH_XC_SSHAGENT
 #include "sshagent/AgentSettingsPage.h"
@@ -118,7 +118,10 @@ private:
 const QString MainWindow::BaseWindowTitle = "KeePassXC";
 
 MainWindow* g_MainWindow = nullptr;
-MainWindow* getMainWindow() { return g_MainWindow; }
+MainWindow* getMainWindow()
+{
+    return g_MainWindow;
+}
 
 MainWindow::MainWindow()
     : m_ui(new Ui::MainWindow())
@@ -162,7 +165,8 @@ MainWindow::MainWindow()
 #if defined(WITH_XC_KEESHARE)
     KeeShare::init(this);
     m_ui->settingsWidget->addSettingsPage(new SettingsPageKeeShare(m_ui->tabWidget));
-	 connect(KeeShare::instance(), SIGNAL(sharingMessage(QString, MessageWidget::MessageType)),
+    connect(KeeShare::instance(),
+            SIGNAL(sharingMessage(QString, MessageWidget::MessageType)),
             SLOT(displayGlobalMessage(QString, MessageWidget::MessageType)));
 #endif
     setWindowIcon(filePath()->applicationIcon());
@@ -848,7 +852,8 @@ bool MainWindow::saveLastDatabases()
     bool openPreviousDatabasesOnStartup = config()->get("OpenPreviousDatabasesOnStartup").toBool();
 
     if (openPreviousDatabasesOnStartup) {
-		  connect(m_ui->tabWidget, SIGNAL(databaseClosed(const QString&)), this, SLOT(rememberOpenDatabases(const QString&)));
+        connect(
+            m_ui->tabWidget, SIGNAL(databaseClosed(const QString&)), this, SLOT(rememberOpenDatabases(const QString&)));
     }
 
     accept = m_ui->tabWidget->closeAllDatabaseTabs();