From 19f2c02eda12290c2e227086bd6ebc4b3284375c Mon Sep 17 00:00:00 2001 From: Joseph Donofry Date: Thu, 15 Jul 2021 18:08:59 -0400 Subject: Remove 'respond to key requests' functionality --- src/Olm.cpp | 5 ++--- src/Utils.cpp | 16 ---------------- src/Utils.h | 6 ------ src/ui/RoomSettings.cpp | 6 ------ src/ui/RoomSettings.h | 2 -- 5 files changed, 2 insertions(+), 33 deletions(-) (limited to 'src') diff --git a/src/Olm.cpp b/src/Olm.cpp index ff4c883b..4a403cd0 100644 --- a/src/Olm.cpp +++ b/src/Olm.cpp @@ -882,13 +882,12 @@ handle_key_request_message(const mtx::events::DeviceEventdebug("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 8d5ae4a9..eabf50d9 100644 --- a/src/Utils.cpp +++ b/src/Utils.cpp @@ -172,22 +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) { diff --git a/src/Utils.h b/src/Utils.h index 1d48e2c7..a50681ca 100644 --- a/src/Utils.h +++ b/src/Utils.h @@ -67,12 +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); diff --git a/src/ui/RoomSettings.cpp b/src/ui/RoomSettings.cpp index f78ef09b..ae5fce0c 100644 --- a/src/ui/RoomSettings.cpp +++ b/src/ui/RoomSettings.cpp @@ -291,12 +291,6 @@ RoomSettings::accessJoinRules() return accessRules_; } -bool -RoomSettings::respondsToKeyRequests() -{ - return usesEncryption_ && utils::respondsToKeyRequests(roomid_); -} - void RoomSettings::changeKeyRequestsPreference(bool isOn) { diff --git a/src/ui/RoomSettings.h b/src/ui/RoomSettings.h index 367f3111..2a68a182 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; -- cgit 1.5.1 From fb3c443ce06dd516e409351cb699a322b92456e0 Mon Sep 17 00:00:00 2001 From: Joe Date: Sat, 24 Jul 2021 18:27:59 -0400 Subject: Remove additional key requests preference code --- src/Utils.cpp | 10 ---------- src/Utils.h | 3 --- src/ui/RoomSettings.cpp | 7 ------- src/ui/RoomSettings.h | 2 -- 4 files changed, 22 deletions(-) (limited to 'src') diff --git a/src/Utils.cpp b/src/Utils.cpp index a99831c4..41013e39 100644 --- a/src/Utils.cpp +++ b/src/Utils.cpp @@ -172,16 +172,6 @@ utils::scaleFactor() return settings.value("settings/scale_factor", -1).toFloat(); } -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 a50681ca..8f37a574 100644 --- a/src/Utils.h +++ b/src/Utils.h @@ -67,9 +67,6 @@ scaleFactor(); void setScaleFactor(float factor); -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 ae5fce0c..fcba8205 100644 --- a/src/ui/RoomSettings.cpp +++ b/src/ui/RoomSettings.cpp @@ -291,13 +291,6 @@ RoomSettings::accessJoinRules() return accessRules_; } -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 2deaa5e3..1c8b47d6 100644 --- a/src/ui/RoomSettings.h +++ b/src/ui/RoomSettings.h @@ -104,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(); @@ -112,7 +111,6 @@ signals: void roomTopicChanged(); void avatarUrlChanged(); void encryptionChanged(); - void keyRequestsChanged(); void notificationsChanged(); void accessJoinRulesChanged(); void displayError(const QString &errorMessage); -- cgit 1.5.1