diff --git a/src/controller.cpp b/src/controller.cpp index af6df22d4..0ec0603f6 100644 --- a/src/controller.cpp +++ b/src/controller.cpp @@ -406,12 +406,3 @@ void Controller::removeConnection(const QString &userId) SettingsGroup("Accounts"_ls).remove(userId); } } - -bool Controller::ssssSupported() const -{ -#if __has_include("Quotient/e2ee/sssshandler.h") - return true; -#else - return false; -#endif -} diff --git a/src/controller.h b/src/controller.h index d48bf52fe..faa4a3bcf 100644 --- a/src/controller.h +++ b/src/controller.h @@ -50,8 +50,6 @@ class Controller : public QObject Q_PROPERTY(QStringList accountsLoading MEMBER m_accountsLoading NOTIFY accountsLoadingChanged) - Q_PROPERTY(bool ssssSupported READ ssssSupported CONSTANT) - public: static Controller &instance(); static Controller *create(QQmlEngine *engine, QJSEngine *) @@ -96,8 +94,6 @@ public: Q_INVOKABLE void removeConnection(const QString &userId); - bool ssssSupported() const; - private: explicit Controller(QObject *parent = nullptr); diff --git a/src/foreigntypes.h b/src/foreigntypes.h index 88d1e127e..3bfb65fac 100644 --- a/src/foreigntypes.h +++ b/src/foreigntypes.h @@ -6,10 +6,8 @@ #include #include -#include -#if __has_include("Quotient/e2ee/sssshandler.h") #include -#endif +#include #include "controller.h" #include "neochatconfig.h" @@ -47,10 +45,8 @@ struct ForeignKeyVerificationSession { QML_UNCREATABLE("") }; -#if __has_include("Quotient/e2ee/sssshandler.h") struct ForeignSSSSHandler { Q_GADGET QML_FOREIGN(Quotient::SSSSHandler) QML_NAMED_ELEMENT(SSSSHandler) }; -#endif diff --git a/src/qml/AccountMenu.qml b/src/qml/AccountMenu.qml index 7ae7edf29..40ae9d3f7 100644 --- a/src/qml/AccountMenu.qml +++ b/src/qml/AccountMenu.qml @@ -70,7 +70,6 @@ QQC2.Menu { onTriggered: pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'UnlockSSSSDialog'), {}, { title: i18nc("@title:window", "Open Key Backup") }) - enabled: Controller.ssssSupported } QQC2.MenuItem { text: i18n("Logout")