diff --git a/src/Olm.cpp b/src/Olm.cpp
index 0c9962f9..69503e6e 100644
--- a/src/Olm.cpp
+++ b/src/Olm.cpp
@@ -964,13 +964,12 @@ handle_key_request_message(const mtx::events::DeviceEvent<mtx::events::msg::KeyR
}
}
- if (!verifiedDevice && !shouldSeeKeys &&
- !utils::respondsToKeyRequests(req.content.room_id)) {
+ if (!verifiedDevice && !shouldSeeKeys) {
nhlog::crypto()->debug("ignoring key request for room {}", req.content.room_id);
return;
}
- if (verifiedDevice || utils::respondsToKeyRequests(req.content.room_id)) {
+ if (verifiedDevice) {
// share the minimum index we have
minimumIndex = -1;
}
diff --git a/src/Utils.cpp b/src/Utils.cpp
index 484b45cf..41013e39 100644
--- a/src/Utils.cpp
+++ b/src/Utils.cpp
@@ -172,32 +172,6 @@ utils::scaleFactor()
return settings.value("settings/scale_factor", -1).toFloat();
}
-bool
-utils::respondsToKeyRequests(const std::string &roomId)
-{
- return respondsToKeyRequests(QString::fromStdString(roomId));
-}
-
-bool
-utils::respondsToKeyRequests(const QString &roomId)
-{
- if (roomId.isEmpty())
- return false;
-
- QSettings settings;
- return settings.value("rooms/respond_to_key_requests/" + roomId, false).toBool();
-}
-
-void
-utils::setKeyRequestsPreference(QString roomId, bool value)
-{
- if (roomId.isEmpty())
- return;
-
- QSettings settings;
- settings.setValue("rooms/respond_to_key_requests/" + roomId, value);
-}
-
QString
utils::descriptiveTime(const QDateTime &then)
{
diff --git a/src/Utils.h b/src/Utils.h
index 1d48e2c7..8f37a574 100644
--- a/src/Utils.h
+++ b/src/Utils.h
@@ -67,15 +67,6 @@ scaleFactor();
void
setScaleFactor(float factor);
-//! Whether or not we should respond to key requests for the given room.
-bool
-respondsToKeyRequests(const QString &roomId);
-bool
-respondsToKeyRequests(const std::string &roomId);
-
-void
-setKeyRequestsPreference(QString roomId, bool value);
-
//! Human friendly timestamp representation.
QString
descriptiveTime(const QDateTime &then);
diff --git a/src/ui/RoomSettings.cpp b/src/ui/RoomSettings.cpp
index f78ef09b..fcba8205 100644
--- a/src/ui/RoomSettings.cpp
+++ b/src/ui/RoomSettings.cpp
@@ -291,19 +291,6 @@ RoomSettings::accessJoinRules()
return accessRules_;
}
-bool
-RoomSettings::respondsToKeyRequests()
-{
- return usesEncryption_ && utils::respondsToKeyRequests(roomid_);
-}
-
-void
-RoomSettings::changeKeyRequestsPreference(bool isOn)
-{
- utils::setKeyRequestsPreference(roomid_, isOn);
- emit keyRequestsChanged();
-}
-
void
RoomSettings::enableEncryption()
{
diff --git a/src/ui/RoomSettings.h b/src/ui/RoomSettings.h
index cf36f795..1c8b47d6 100644
--- a/src/ui/RoomSettings.h
+++ b/src/ui/RoomSettings.h
@@ -78,7 +78,6 @@ class RoomSettings : public QObject
Q_PROPERTY(bool canChangeJoinRules READ canChangeJoinRules CONSTANT)
Q_PROPERTY(bool canChangeNameAndTopic READ canChangeNameAndTopic CONSTANT)
Q_PROPERTY(bool isEncryptionEnabled READ isEncryptionEnabled NOTIFY encryptionChanged)
- Q_PROPERTY(bool respondsToKeyRequests READ respondsToKeyRequests NOTIFY keyRequestsChanged)
public:
RoomSettings(QString roomid, QObject *parent = nullptr);
@@ -91,7 +90,6 @@ public:
int memberCount() const;
int notifications();
int accessJoinRules();
- bool respondsToKeyRequests();
bool isLoading() const;
//! Whether the user has enough power level to send m.room.join_rules events.
bool canChangeJoinRules() const;
@@ -106,7 +104,6 @@ public:
Q_INVOKABLE void openEditModal();
Q_INVOKABLE void changeAccessRules(int index);
Q_INVOKABLE void changeNotifications(int currentIndex);
- Q_INVOKABLE void changeKeyRequestsPreference(bool isOn);
signals:
void loadingChanged();
@@ -114,7 +111,6 @@ signals:
void roomTopicChanged();
void avatarUrlChanged();
void encryptionChanged();
- void keyRequestsChanged();
void notificationsChanged();
void accessJoinRulesChanged();
void displayError(const QString &errorMessage);
|
