SimpleCrypt password jamming is now optional

find boos cmake new policy
magick instead of convert rendering images
2024-11-17 20:25:33 +02:00 · 2024-10-27 20:02:34 +02:00 · 2024-10-27 19:33:03 +02:00 · 2024-10-27 19:33:03 +02:00 · 2024-10-13 07:37:05 +00:00 · 2024-10-13 07:35:29 +00:00
14 changed files with 140 additions and 79 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -1,9 +1,10 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.16)
 project(squawk VERSION 0.2.3 LANGUAGES CXX)

 cmake_policy(SET CMP0076 NEW)
 cmake_policy(SET CMP0077 NEW)
 cmake_policy(SET CMP0079 NEW)
+cmake_policy(SET CMP0167 NEW)
 set(CMAKE_CXX_STANDARD 17)

 set(QT_VERSION_MAJOR 5)
@ -33,7 +34,8 @@ option(SYSTEM_LMDBAL "Use system lmdbal lib" ON)
 option(WITH_KWALLET "Build KWallet support module" ON)
 option(WITH_KIO "Build KIO support module" ON)
 option(WITH_KCONFIG "Build KConfig support module" ON)
-option(WITH_OMEMO "Build OMEMO support module" OFF)   #it should be off by default untill I sourt the problems out
+option(WITH_OMEMO "Build OMEMO support module" OFF)   #it should be off by default untill I sort the problems out
+option(WITH_SIMPLE_CRYPT "Builds with SimpleCrypt to obfuscate password" ON)

 # Dependencies
 ## Qt
@ -175,13 +177,18 @@ target_link_libraries(squawk
  Qt${QT_VERSION_MAJOR}::Xml
  LMDBAL::LMDBAL
  QXmpp::QXmpp
-  simpleCrypt
 )

 if (WITH_OMEMO)
  target_link_libraries(squawk PRIVATE QXmpp::Omemo)
 endif ()

+if (WITH_SIMPLE_CRYPT)
+  target_compile_definitions(squawk PRIVATE WITH_SIMPLE_CRYPT)
+  add_subdirectory(external/simpleCrypt)
+  target_link_libraries(squawk PRIVATE simpleCrypt)
+endif ()
+
 ## Link thread libraries on Linux
 if(UNIX AND NOT APPLE)
  set(THREADS_PREFER_PTHREAD_FLAG ON)
@ -211,9 +218,13 @@ if(CMAKE_COMPILER_IS_GNUCXX)
  target_compile_options(squawk PRIVATE ${COMPILE_OPTIONS})
 endif(CMAKE_COMPILER_IS_GNUCXX)

+# I am not really sure about this solution
+# This should enable plugins to be found in path like /usr/lib/squawk instead of just /usr/lib
+set(PLUGIN_PATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/squawk")
+add_compile_definitions(PLUGIN_PATH="${PLUGIN_PATH}")
+
 add_subdirectory(main)
 add_subdirectory(core)
-add_subdirectory(external/simpleCrypt)
 add_subdirectory(packaging)
 add_subdirectory(plugins)
 add_subdirectory(resources)
--- a/README.md
+++ b/README.md
@ -4,7 +4,7 @@
 [![AUR version](https://img.shields.io/aur/version/squawk?style=flat-square)](https://aur.archlinux.org/packages/squawk/)
 [![Liberapay patrons](https://img.shields.io/liberapay/patrons/macaw.me?logo=liberapay&style=flat-square)](https://liberapay.com/macaw.me)

-![Squawk screenshot](https://macaw.me/images/squawk/0.2.2.png)
+![Squawk screenshot](https://macaw.me/projects/squawk/0.2.2.png)

 ### Prerequisites

--- a/core/passwordStorageEngines/kwallet.cpp
+++ b/core/passwordStorageEngines/kwallet.cpp
@ -28,7 +28,8 @@ Core::PSE::KWallet::CreateFolder Core::PSE::KWallet::createFolder = 0;
 Core::PSE::KWallet::SetFolder Core::PSE::KWallet::setFolder = 0;

 Core::PSE::KWallet::SupportState Core::PSE::KWallet::sState = Core::PSE::KWallet::initial;
-QLibrary Core::PSE::KWallet::lib("kwalletWrapper");
+
+QLibrary Core::PSE::KWallet::lib(QString("%1/kwalletWrapper").arg(PLUGIN_PATH));

 Core::PSE::KWallet::KWallet():
    QObject(),
--- a/core/passwordStorageEngines/wrappers/CMakeLists.txt
+++ b/core/passwordStorageEngines/wrappers/CMakeLists.txt
@ -1,4 +1,4 @@
 add_library(kwalletWrapper SHARED kwallet.cpp)
 target_link_libraries(kwalletWrapper PRIVATE KF5::Wallet)

-install(TARGETS kwalletWrapper LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+install(TARGETS kwalletWrapper LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/squawk)
--- a/core/squawk.cpp
+++ b/core/squawk.cpp
@ -22,6 +22,10 @@
 #include <QDir>
 #include <QStandardPaths>

+#ifdef WITH_SIMPLE_CRYPT
+#include "external/simpleCrypt/simplecrypt.h"
+#endif
+
 Core::Squawk::Squawk(QObject* parent):
    QObject(parent),
    accounts(),
@ -71,7 +75,6 @@ void Core::Squawk::stop() {
        QSettings settings;
        settings.beginGroup("core");
        settings.beginWriteArray("accounts");
-        SimpleCrypt crypto(passwordHash);
        for (std::deque<Account*>::size_type i = 0; i < accounts.size(); ++i) {
            settings.setArrayIndex(i);
            Account* acc = accounts[i];
@ -84,7 +87,13 @@ void Core::Squawk::stop() {
                    password = acc->getPassword();
                    break;
                case Shared::AccountPassword::jammed:
-                    password = crypto.encryptToString(acc->getPassword());
+#ifdef WITH_SIMPLE_CRYPT2
+                    password = SimpleCrypt(passwordHash).encryptToString(acc->getPassword());
+#else
+                    qDebug() << "The password for account" << acc->getName() << "is set to be jammed, but Squawk was compiled without SimpleCrypt support";
+                    qDebug("Can not encode password, setting this account to always ask password mode");
+                    ap = Shared::AccountPassword::alwaysAsk;
+#endif
                    break;
                default:
                    break;
@ -697,17 +706,24 @@ void Core::Squawk::readSettings() {
                settings.value("passwordType", static_cast<int>(Shared::AccountPassword::plain)).toInt()
            );

+        QString name = settings.value("name").toString();
        QString password = settings.value("password", "").toString();
        if (passwordType == Shared::AccountPassword::jammed) {
+#ifdef WITH_SIMPLE_CRYPT
            SimpleCrypt crypto(passwordHash);
            password = crypto.decryptToString(password);
+#else
+            qDebug() << "The password for account" << name << "is jammed, but Squawk was compiled without SimpleCrypt support";
+            qDebug("Can not decode password, setting this account to always ask password mode");
+            passwordType = Shared::AccountPassword::alwaysAsk;
+#endif
        }

        addAccount(
            settings.value("login").toString(), 
            settings.value("server").toString(), 
            password,
-            settings.value("name").toString(),
+            name,
            settings.value("resource").toString(),
            settings.value("active").toBool(),
            passwordType
--- a/core/squawk.h
+++ b/core/squawk.h
@ -33,7 +33,6 @@
 #include "shared/global.h"
 #include "shared/info.h"
 #include "shared/clientinfo.h"
-#include "external/simpleCrypt/simplecrypt.h"

 #include <core/components/clientcache.h>
 #include <core/components/networkaccess.h>
@ -42,10 +41,8 @@
 #include "passwordStorageEngines/kwallet.h"
 #endif

-namespace Core
-{
-class Squawk : public QObject
-{
+namespace Core {
+class Squawk : public QObject {
    Q_OBJECT

 public:
--- a/main/root.cpp
+++ b/main/root.cpp
@ -58,6 +58,7 @@ Root::~Root() {
        delete gui;
        if (core != nullptr)
            delete core;
+
        delete coreThread;
    }
    delete global;
@ -72,13 +73,13 @@ void Root::initializeTranslation() {
    bool found = false;
    for (QString share : shares) {
        found = currentTranslator.load(QLocale(), QLatin1String("squawk"), ".", share + "/l10n");
-        if (found) {
+        if (found)
            break;
-        }
    }
-    if (!found) {
+
+    if (!found)
        currentTranslator.load(QLocale(), QLatin1String("squawk"), ".", QCoreApplication::applicationDirPath());
-    }
+

    installTranslator(&currentTranslator);
 }
@ -94,18 +95,16 @@ bool Root::initializeSettings() {
    QVariant vs = settings.value("style");
    if (vs.isValid()) {
        QString style = vs.toString().toLower();
-        if (style != "system") {
+        if (style != "system")
            Shared::Global::setStyle(style);
-        }
    }

    if (Shared::Global::supported("colorSchemeTools")) {
        QVariant vt = settings.value("theme");
        if (vt.isValid()) {
            QString theme = vt.toString();
-            if (theme.toLower() != "system") {
+            if (theme.toLower() != "system")
                Shared::Global::setTheme(theme);
-            }
        }
    }

--- a/packaging/CMakeLists.txt
+++ b/packaging/CMakeLists.txt
@ -1,3 +1,7 @@
 configure_file(squawk.desktop squawk.desktop COPYONLY)

-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/squawk.desktop DESTINATION ${CMAKE_INSTALL_DATADIR}/applications)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/squawk.desktop DESTINATION ${CMAKE_INSTALL_DATADIR}/applications)
+
+configure_file(macaw.me.squawk.appdata.xml macaw.me.squawk.appdata.xml COPYONLY)
+
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/macaw.me.squawk.appdata.xml DESTINATION ${CMAKE_INSTALL_DATADIR}/metainfo)
--- a/packaging/macaw.me.squawk.appdata.xml
+++ b/packaging/macaw.me.squawk.appdata.xml
@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:its="http://www.w3.org/2005/11/its" xmlns="https://specifications.freedesktop.org/metainfo/1.0" type="desktop-application">
+  <id>macaw.me.squawk</id>
+  <metadata_license>CC0-1.0</metadata_license>
+  <project_license>GPL-3.0+</project_license>
+  <name>Squawk</name>
+  <summary>Desktop Qt based XMPP messenger</summary>
+  <description>
+    <p>
+      Squawk is a lightweight XMPP desktop messenger.
+      The primary objective of this project is to offer
+      you a fast and user-friendly messaging experience
+      that closely aligns with your system’s style, while
+      also minimizing resource consumption.
+    </p>
+    <p>
+      Squawk is still at a very early stage and might not suit
+      everyone but you are welcome to try it out.
+    </p>
+  </description>
+  <launchable type="desktop-id">macaw.me.squawk.desktop</launchable>
+  <screenshots>
+    <screenshot type="default">
+      <image>https://macaw.me/projects/squawk/0.2.2.png</image>
+      <caption>View XMPP contacts and conversations</caption>
+    </screenshot>
+  </screenshots>
+  <url type="homepage">https://macaw.me/projects/squawk/</url>
+  <provides>
+    <binary>squawk</binary>
+  </provides>
+  <update_contact>blue@macaw.me</update_contact>
+</component>
--- a/plugins/CMakeLists.txt
+++ b/plugins/CMakeLists.txt
@ -2,7 +2,7 @@ if (WITH_KIO)
  add_library(openFileManagerWindowJob SHARED openfilemanagerwindowjob.cpp)
  target_link_libraries(openFileManagerWindowJob PRIVATE KF5::KIOWidgets)

-  install(TARGETS openFileManagerWindowJob LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+  install(TARGETS openFileManagerWindowJob LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/squawk)
 endif ()

 if (WITH_KCONFIG)
@ -10,5 +10,5 @@ if (WITH_KCONFIG)
  target_link_libraries(colorSchemeTools PRIVATE KF5::ConfigCore)
  target_link_libraries(colorSchemeTools PRIVATE KF5::ConfigWidgets)

-  install(TARGETS colorSchemeTools LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+  install(TARGETS colorSchemeTools LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/squawk)
 endif()
--- a/resources/CMakeLists.txt
+++ b/resources/CMakeLists.txt
@ -3,11 +3,8 @@ target_sources(squawk PRIVATE resources.qrc)
 configure_file(images/logo.svg squawk.svg COPYONLY)
 configure_file(squawk.rc squawk.rc COPYONLY)

-if(WIN32)
-    set(CONVERT_BIN magick convert)
-else(WIN32)
-    set(CONVERT_BIN convert)
-endif(WIN32)
+set(CONVERT_BIN magick)
+
 execute_process(COMMAND ${CONVERT_BIN} -background none -size 48x48 squawk.svg squawk48.png WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
 execute_process(COMMAND ${CONVERT_BIN} -background none -size 64x64 squawk.svg squawk64.png WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
 execute_process(COMMAND ${CONVERT_BIN} -background none -size 128x128 squawk.svg squawk128.png WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
@ -18,20 +15,20 @@ if (WIN32)
    set(SQUAWK_WIN_RC "${CMAKE_CURRENT_BINARY_DIR}/squawk.rc")
    set(SQUAWK_WIN_RC "${SQUAWK_WIN_RC}" PARENT_SCOPE)
    target_sources(squawk PRIVATE ${SQUAWK_WIN_RC})
-endif(WIN32)
+endif (WIN32)

 if (APPLE)
    file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/icns.iconset")
-    execute_process(COMMAND convert -background none -size 16x16 squawk.svg icns.iconset/icon_16x16.png WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
-    execute_process(COMMAND convert -background none -resize !32x32 squawk.svg "icns.iconset/icon_16x16@2x.png" WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
-    execute_process(COMMAND convert -background none -resize !32x32 squawk.svg "icns.iconset/icon_32x32.png" WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
-    execute_process(COMMAND convert -background none -resize !64x64 squawk.svg "icns.iconset/icon_32x32@2x.png" WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
-    execute_process(COMMAND convert -background none -resize !128x128 squawk.svg "icns.iconset/icon_128x128.png" WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
-    execute_process(COMMAND convert -background none -resize !256x256 squawk.svg "icns.iconset/icon_128x128@2x.png" WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
-    execute_process(COMMAND convert -background none -resize !256x256 squawk.svg "icns.iconset/icon_256x256.png" WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
-    execute_process(COMMAND convert -background none -resize !512x512 squawk.svg "icns.iconset/icon_256x256@2x.png" WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
-    execute_process(COMMAND convert -background none -resize !512x512 squawk.svg "icns.iconset/icon_512x512.png" WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
-    execute_process(COMMAND convert -background none -resize !1024x1024 squawk.svg "icns.iconset/icon_512x512@2x.png" WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+    execute_process(COMMAND ${CONVERT_BIN} -background none -size 16x16 squawk.svg icns.iconset/icon_16x16.png WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+    execute_process(COMMAND ${CONVERT_BIN} -background none -resize !32x32 squawk.svg "icns.iconset/icon_16x16@2x.png" WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+    execute_process(COMMAND ${CONVERT_BIN} -background none -resize !32x32 squawk.svg "icns.iconset/icon_32x32.png" WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+    execute_process(COMMAND ${CONVERT_BIN} -background none -resize !64x64 squawk.svg "icns.iconset/icon_32x32@2x.png" WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+    execute_process(COMMAND ${CONVERT_BIN} -background none -resize !128x128 squawk.svg "icns.iconset/icon_128x128.png" WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+    execute_process(COMMAND ${CONVERT_BIN} -background none -resize !256x256 squawk.svg "icns.iconset/icon_128x128@2x.png" WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+    execute_process(COMMAND ${CONVERT_BIN} -background none -resize !256x256 squawk.svg "icns.iconset/icon_256x256.png" WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+    execute_process(COMMAND ${CONVERT_BIN} -background none -resize !512x512 squawk.svg "icns.iconset/icon_256x256@2x.png" WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+    execute_process(COMMAND ${CONVERT_BIN} -background none -resize !512x512 squawk.svg "icns.iconset/icon_512x512.png" WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+    execute_process(COMMAND ${CONVERT_BIN} -background none -resize !1024x1024 squawk.svg "icns.iconset/icon_512x512@2x.png" WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
    execute_process(COMMAND iconutil -c icns "icns.iconset" -o "squawk.icns" WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
    set(MACOSX_BUNDLE_ICON_FILE squawk.icns)
    set(MACOSX_BUNDLE_ICON_FILE ${MACOSX_BUNDLE_ICON_FILE} PARENT_SCOPE)
@ -47,8 +44,8 @@ if (APPLE)
          MACOSX_BUNDLE_ICON_FILE "${MACOSX_BUNDLE_ICON_FILE}" # TODO
          MACOSX_BUNDLE_BUNDLE_NAME "Squawk"
          MACOSX_BUNDLE_INFO_PLIST ${CMAKE_SOURCE_DIR}/cmake/MacOSXBundleInfo.plist.in)
-      endif(APPLE)
-    endif()
+      endif (APPLE)
+    endif ()
 endif (APPLE)

 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/squawk.svg DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/scalable/apps)
--- a/shared/global.cpp
+++ b/shared/global.cpp
@ -21,6 +21,13 @@

 #include "enums.h"
 #include "ui/models/roster.h"
+
+#ifdef WITH_SIMPLE_CRYPT
+#define SIMPLE_CRYPT_ENABLED true
+#else
+#define SIMPLE_CRYPT_ENABLED false
+#endif
+
 #ifdef WITH_OMEMO
 constexpr bool OMEMO_SUPPORT = true;
 #else
@ -36,11 +43,10 @@ QFont getFont (QFontDatabase::SystemFont type, bool bold = false, bool italic =

    if (factor != 1.0) {
        float ps = font.pointSizeF();
-        if (ps != -1) {
+        if (ps != -1)
            font.setPointSizeF(ps * factor);
-        } else {
+        else
            font.setPointSize(font.pointSize() * factor);
-        }
    }

    return font;
@ -50,12 +56,12 @@ Shared::Global* Shared::Global::instance = 0;
 const std::set<QString> Shared::Global::supportedImagesExts = {"png", "jpg", "webp", "jpeg", "gif", "svg"};

 #ifdef WITH_KIO
-QLibrary Shared::Global::openFileManagerWindowJob("openFileManagerWindowJob");
+QLibrary Shared::Global::openFileManagerWindowJob(QString("%1/openFileManagerWindowJob").arg(PLUGIN_PATH));
 Shared::Global::HighlightInFileManager Shared::Global::hfm = 0;
 #endif

 #ifdef WITH_KCONFIG
-QLibrary Shared::Global::colorSchemeTools("colorSchemeTools");
+QLibrary Shared::Global::colorSchemeTools(QString("%1/colorSchemeTools").arg(PLUGIN_PATH));
 Shared::Global::CreatePreview Shared::Global::createPreview = 0;
 Shared::Global::DeletePreview Shared::Global::deletePreview = 0;
 Shared::Global::ColorSchemeName Shared::Global::colorSchemeName = 0;
@ -148,10 +154,11 @@ Shared::Global::Global():
    smallFontMetrics(smallFont),
    headerFontMetrics(headerFont),
    titleFontMetrics(titleFont),
-    pluginSupport({
+    optionalFeatures({
        {"KWallet", false},
        {"openFileManagerWindowJob", false},
-        {"colorSchemeTools", false}
+        {"colorSchemeTools", false},
+        {"simpleCryptJammedPassword", SIMPLE_CRYPT_ENABLED}
    }),
    fileCache()
 {
@ -197,8 +204,7 @@ Shared::Global::Global():


 static const QSize defaultIconFileInfoHeight(50, 50);
-Shared::Global::FileInfo Shared::Global::getFileInfo(const QString& path)
-{
+Shared::Global::FileInfo Shared::Global::getFileInfo(const QString& path) {
    std::map<QString, FileInfo>::const_iterator itr = instance->fileCache.find(path);
    if (itr == instance->fileCache.end()) {
        QMimeDatabase db;
@ -275,17 +281,17 @@ QString Shared::Global::getName(EncryptionProtocol ep) {
 }

 void Shared::Global::setSupported(const QString& pluginName, bool support) {
-    std::map<QString, bool>::iterator itr = instance->pluginSupport.find(pluginName);
-    if (itr != instance->pluginSupport.end()) {
+    std::map<QString, bool>::iterator itr = instance->optionalFeatures.find(pluginName);
+    if (itr != instance->optionalFeatures.end()) {
        itr->second = support;
    }
 }

 bool Shared::Global::supported(const QString& pluginName) {
-    std::map<QString, bool>::iterator itr = instance->pluginSupport.find(pluginName);
-    if (itr != instance->pluginSupport.end()) {
+    std::map<QString, bool>::iterator itr = instance->optionalFeatures.find(pluginName);
+    if (itr != instance->optionalFeatures.end())
        return itr->second;
-    }
+
    return false;
 }

@ -325,11 +331,10 @@ void Shared::Global::highlightInFileManager(const QString& path)
        QString output = proc.readLine().simplified();
        
        QString folder;
-        if (info.isDir()) {
+        if (info.isDir())
            folder = info.canonicalFilePath();
-        } else {
+        else
            folder = info.canonicalPath();
-        }
        
        if (output.contains(dolphinReg)) {
            //there is a bug on current (21.04.0) dolphin, it works correct only if you already have dolphin launched
@ -389,20 +394,19 @@ void Shared::Global::setTheme(const QString& path) {
 }

 void Shared::Global::setStyle(const QString& style) {
-    if (style.toLower() == "system") {
+    if (style.toLower() == "system")
        QApplication::setStyle(getInstance()->defaultSystemStyle);
-    } else {
+    else
        QApplication::setStyle(style);
-    }
 }

 #define FROM_INT_INPL(Enum)                                                                 \
 template<>                                                                                  \
 Enum Shared::Global::fromInt(int src)                                                       \
 {                                                                                           \
-    if (src < static_cast<int>(Enum##Lowest) || src > static_cast<int>(Enum##Highest)) {    \
+    if (src < static_cast<int>(Enum##Lowest) || src > static_cast<int>(Enum##Highest))      \
        throw EnumOutOfRange(#Enum);                                                        \
-    }                                                                                       \
+                                                                                            \
    return static_cast<Enum>(src);                                                          \
 }                                                                                           \
 template<>                                                                                  \
--- a/shared/global.h
+++ b/shared/global.h
@ -135,7 +135,7 @@ namespace Shared {
    private:
        static Global* instance;
        
-        std::map<QString, bool> pluginSupport;
+        std::map<QString, bool> optionalFeatures;
        std::map<QString, FileInfo> fileCache;
        
 #ifdef WITH_KIO
--- a/ui/widgets/accounts/account.cpp
+++ b/ui/widgets/accounts/account.cpp
@ -26,6 +26,7 @@ Account::Account():
    m_ui->setupUi(this);
    
    connect(m_ui->passwordType, qOverload<int>(&QComboBox::currentIndexChanged), this, &Account::onComboboxChange);
+    QStandardItemModel *model = static_cast<QStandardItemModel*>(m_ui->passwordType->model());
    
    for (int i = static_cast<int>(Shared::AccountPasswordLowest); i < static_cast<int>(Shared::AccountPasswordHighest) + 1; ++i) {
        Shared::AccountPassword ap = static_cast<Shared::AccountPassword>(i);
@ -34,18 +35,19 @@ Account::Account():
    m_ui->passwordType->setCurrentIndex(static_cast<int>(Shared::AccountPassword::plain));
    
    if (!Shared::Global::supported("KWallet")) {
-        QStandardItemModel *model = static_cast<QStandardItemModel*>(m_ui->passwordType->model());
        QStandardItem *item = model->item(static_cast<int>(Shared::AccountPassword::kwallet));
        item->setFlags(item->flags() & ~Qt::ItemIsEnabled);
    }
+
+    if (!Shared::Global::supported("simpleCryptJammedPassword")) {
+        QStandardItem *item = model->item(static_cast<int>(Shared::AccountPassword::jammed));
+        item->setFlags(item->flags() & ~Qt::ItemIsEnabled);
+    }
 }

-Account::~Account()
-{
-}
+Account::~Account() {}

-QMap<QString, QVariant> Account::value() const
-{
+QMap<QString, QVariant> Account::value() const {
    QMap<QString, QVariant> map;
    map["login"] = m_ui->login->text();
    map["password"] = m_ui->password->text();
@ -58,13 +60,11 @@ QMap<QString, QVariant> Account::value() const
    return map;
 }

-void Account::lockId()
-{
+void Account::lockId() {
    m_ui->name->setReadOnly(true);;
 }

-void Account::setData(const QMap<QString, QVariant>& data)
-{
+void Account::setData(const QMap<QString, QVariant>& data) {
    m_ui->login->setText(data.value("login").toString());
    m_ui->password->setText(data.value("password").toString());
    m_ui->server->setText(data.value("server").toString());
@ -73,8 +73,7 @@ void Account::setData(const QMap<QString, QVariant>& data)
    m_ui->passwordType->setCurrentIndex(data.value("passwordType").toInt());
 }

-void Account::onComboboxChange(int index)
-{
+void Account::onComboboxChange(int index) {
    QString description = Shared::Global::getDescription(Shared::Global::fromInt<Shared::AccountPassword>(index));
    m_ui->comment->setText(description);
 }
Author	SHA1	Message	Date
blue	9a44ae1fa5	SimpleCrypt password jamming is now optional	2024-11-17 20:25:33 +02:00
blue	85ff6c25ba	find boos cmake new policy magick instead of convert rendering images	2024-10-27 20:02:34 +02:00
blue	3cc7db8eff	A workaround to store plugins in a subdirectory	2024-10-27 19:33:03 +02:00
Benson Muite	ff9a591d6d	Private libraries directory	2024-10-27 19:33:03 +02:00
Blue	8e3f10caff	Merge pull request 'Add appdata file' (#94 ) from bmckwm/squawk:appdata into master Reviewed-on: blue/squawk#94 Reviewed-by: Blue <blue@macaw.me>	2024-10-13 07:37:05 +00:00
Blue	8bfe88929f	Merge pull request 'Fix license text error' (#90 ) from bmckwm/squawk:license into master Reviewed-on: blue/squawk#90 Reviewed-by: Blue <blue@macaw.me>	2024-10-13 07:35:29 +00:00
Blue	9927bdc38b	Merge pull request 'Update image link' (#87 ) from bmckwm/squawk:image-link-update into master Reviewed-on: blue/squawk#87 Reviewed-by: Blue <blue@macaw.me>	2024-10-13 07:34:34 +00:00
Benson Muite	030c374139	Update image link	2024-10-06 19:29:38 +03:00
Benson Muite	2c61b82924	Add appdata file	2024-10-06 19:26:44 +03:00