summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorJoe <rubberduckie3554@gmail.com>2021-07-24 18:27:59 -0400
committerJoe <rubberduckie3554@gmail.com>2021-07-24 18:27:59 -0400
commitfb3c443ce06dd516e409351cb699a322b92456e0 (patch)
treeb1f7c8de33812034ea690d8824f43336b303ba4e /src
parentMerge master and fix conflicts (diff)
downloadnheko-fb3c443ce06dd516e409351cb699a322b92456e0.tar.xz
Remove additional key requests preference code
Diffstat (limited to 'src')
-rw-r--r--src/Utils.cpp10
-rw-r--r--src/Utils.h3
-rw-r--r--src/ui/RoomSettings.cpp7
-rw-r--r--src/ui/RoomSettings.h2
4 files changed, 0 insertions, 22 deletions
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
@@ -292,13 +292,6 @@ RoomSettings::accessJoinRules() } void -RoomSettings::changeKeyRequestsPreference(bool isOn) -{ - utils::setKeyRequestsPreference(roomid_, isOn); - emit keyRequestsChanged(); -} - -void RoomSettings::enableEncryption() { if (usesEncryption_) 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);