From f2b40af3e20f1c5b94a30915d8c5fe8ca6d8d910 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Blin?=
<sebastien.blin@savoirfairelinux.com>
Date: Wed, 12 Oct 2022 11:30:42 -0400
Subject: [PATCH] misc: cleanup settings
+ Remove "Accept files from unknown senders" because since swarm
we can't get files from non contacts are the conversation is not
cloned, and non swarm files are ignored
+ Rename "ignore the swarm" to "Mute conversation" as ignore is
unclear
Change-Id: Ifced8f8efe841e2345d50530ee313e6b95b35920
---
src/app/appsettingsmanager.h | 1 -
src/app/constant/JamiStrings.qml | 5 ++---
src/app/currentaccount.cpp | 3 ---
src/app/currentaccount.h | 1 -
src/app/mainapplication.cpp | 3 ---
src/app/mainview/components/SwarmDetailsPanel.qml | 4 ++--
.../components/FileTransferSettings.qml | 15 ---------------
src/libclient/api/accountmodel.h | 4 ----
src/libclient/conversationmodel.cpp | 11 -----------
9 files changed, 4 insertions(+), 43 deletions(-)
diff --git a/src/app/appsettingsmanager.h b/src/app/appsettingsmanager.h
index 621204ff1..fcc6b2bd0 100644
--- a/src/app/appsettingsmanager.h
+++ b/src/app/appsettingsmanager.h
@@ -39,7 +39,6 @@ extern const QString defaultDownloadPath;
X(EnableNotifications, true) \
X(EnableTypingIndicator, true) \
X(EnableReadReceipt, true) \
- X(AllowFromUntrusted, false) \
X(AcceptTransferBelow, 20) \
X(AutoAcceptFiles, true) \
X(DisplayHyperlinkPreviews, true) \
diff --git a/src/app/constant/JamiStrings.qml b/src/app/constant/JamiStrings.qml
index 67f5781ae..90e255d45 100644
--- a/src/app/constant/JamiStrings.qml
+++ b/src/app/constant/JamiStrings.qml
@@ -448,7 +448,6 @@ Item {
// File transfer settings
property string fileTransfer: qsTr("File transfer")
- property string allowFromUntrusted: qsTr("Accept files from unknown senders")
property string autoAcceptFiles: qsTr("Automatically accept incoming files")
property string acceptTransferBelow: qsTr("Accept transfer limit")
property string acceptTransferTooltip: qsTr("in MB, 0 = unlimited")
@@ -741,8 +740,8 @@ Item {
property string swarmName: qsTr("Swarm's name")
property string addADescription: qsTr("Add a description")
- property string ignoreTheSwarm: qsTr("Ignore the swarm")
- property string ignoreTheSwarmTooltip: qsTr("Ignore all notifications from this conversation")
+ property string muteConversation: qsTr("Mute conversation")
+ property string ignoreNotificationsTooltip: qsTr("Ignore all notifications from this conversation")
property string chooseAColor: qsTr("Choose a color")
property string leaveTheSwarm: qsTr("Leave the swarm")
property string leave: qsTr("Leave")
diff --git a/src/app/currentaccount.cpp b/src/app/currentaccount.cpp
index 3599828ac..24eb9f63e 100644
--- a/src/app/currentaccount.cpp
+++ b/src/app/currentaccount.cpp
@@ -188,9 +188,6 @@ CurrentAccount::updateData()
set_autoTransferFromTrusted(settingsManager_->getValue(Settings::Key::AutoAcceptFiles)
.toBool(),
true);
- set_autoTransferFromUntrusted(settingsManager_->getValue(Settings::Key::AllowFromUntrusted)
- .toBool(),
- true);
set_autoTransferSizeThreshold(settingsManager_->getValue(Settings::Key::AcceptTransferBelow)
.toInt(),
true);
diff --git a/src/app/currentaccount.h b/src/app/currentaccount.h
index 799a1036a..4141f8638 100644
--- a/src/app/currentaccount.h
+++ b/src/app/currentaccount.h
@@ -187,7 +187,6 @@ class CurrentAccount final : public QObject
// NewAccount model settings
QML_NEW_ACCOUNT_MODEL_SETTINGS_PROPERTY(bool, autoTransferFromTrusted, AutoAcceptFiles)
- QML_NEW_ACCOUNT_MODEL_SETTINGS_PROPERTY(bool, autoTransferFromUntrusted, AllowFromUntrusted)
QML_NEW_ACCOUNT_MODEL_SETTINGS_PROPERTY(int, autoTransferSizeThreshold, AcceptTransferBelow)
public:
diff --git a/src/app/mainapplication.cpp b/src/app/mainapplication.cpp
index 829f17fa6..76aa42d77 100644
--- a/src/app/mainapplication.cpp
+++ b/src/app/mainapplication.cpp
@@ -182,13 +182,10 @@ MainApplication::init()
Qt::DirectConnection);
auto downloadPath = settingsManager_->getValue(Settings::Key::DownloadPath);
- auto allowTransferFromUntrusted = settingsManager_->getValue(Settings::Key::AllowFromUntrusted)
- .toBool();
auto allowTransferFromTrusted = settingsManager_->getValue(Settings::Key::AutoAcceptFiles)
.toBool();
auto acceptTransferBelow = settingsManager_->getValue(Settings::Key::AcceptTransferBelow).toInt();
lrcInstance_->accountModel().downloadDirectory = downloadPath.toString() + "/";
- lrcInstance_->accountModel().autoTransferFromUntrusted = allowTransferFromUntrusted;
lrcInstance_->accountModel().autoTransferFromTrusted = allowTransferFromTrusted;
lrcInstance_->accountModel().autoTransferSizeThreshold = acceptTransferBelow;
diff --git a/src/app/mainview/components/SwarmDetailsPanel.qml b/src/app/mainview/components/SwarmDetailsPanel.qml
index ca0e65834..049a3cda4 100644
--- a/src/app/mainview/components/SwarmDetailsPanel.qml
+++ b/src/app/mainview/components/SwarmDetailsPanel.qml
@@ -259,10 +259,10 @@ Rectangle {
checked: CurrentConversation.ignoreNotifications
- labelText: JamiStrings.ignoreTheSwarm
+ labelText: JamiStrings.muteConversation
fontPointSize: JamiTheme.settingsFontSize
- tooltipText: JamiStrings.ignoreTheSwarmTooltip
+ tooltipText: JamiStrings.ignoreNotificationsTooltip
onSwitchToggled: {
CurrentConversation.setPreference("ignoreNotifications", checked ? "true" : "false")
diff --git a/src/app/settingsview/components/FileTransferSettings.qml b/src/app/settingsview/components/FileTransferSettings.qml
index 3d5f0d308..7794fd2fa 100644
--- a/src/app/settingsview/components/FileTransferSettings.qml
+++ b/src/app/settingsview/components/FileTransferSettings.qml
@@ -41,21 +41,6 @@ ColumnLayout {
verticalAlignment: Text.AlignVCenter
}
- ToggleSwitch {
- id: allowFromUntrustedCheckbox
- Layout.fillWidth: true
- Layout.leftMargin: JamiTheme.preferredMarginSize
-
- checked: CurrentAccount.autoTransferFromUntrusted
-
- labelText: JamiStrings.allowFromUntrusted
- fontPointSize: JamiTheme.settingsFontSize
-
- tooltipText: JamiStrings.allowFromUntrusted
-
- onSwitchToggled: CurrentAccount.autoTransferFromUntrusted = checked
- }
-
ToggleSwitch {
id: autoAcceptFilesCheckbox
Layout.fillWidth: true
diff --git a/src/libclient/api/accountmodel.h b/src/libclient/api/accountmodel.h
index c0c2c7a43..73c2bbfde 100644
--- a/src/libclient/api/accountmodel.h
+++ b/src/libclient/api/accountmodel.h
@@ -73,10 +73,6 @@ public:
* Should contains the full directory with the end marker (/ on linux for example)
*/
QString downloadDirectory;
- /**
- * Accept transfer from untrusted contacts
- */
- bool autoTransferFromUntrusted {false};
/**
* Accept transfer from trusted contacts
*/
diff --git a/src/libclient/conversationmodel.cpp b/src/libclient/conversationmodel.cpp
index c6e136e63..0a4184ffb 100644
--- a/src/libclient/conversationmodel.cpp
+++ b/src/libclient/conversationmodel.cpp
@@ -3978,17 +3978,6 @@ ConversationModelPimpl::awaitingHost(const QString& fileId, datatransfer::Info i
}
auto conversationIdx = indexOf(conversationId);
auto& peers = peersForConversation(conversations[conversationIdx]);
- // Only accept if contact is added or it is a group conversation
- if (linked.owner.accountModel->autoTransferFromUntrusted && peers.size() == 1) {
- try {
- auto contactUri = peers.front();
- auto contactInfo = linked.owner.contactModel->getContact(contactUri);
- if (contactInfo.profileInfo.type == profile::Type::PENDING)
- return;
- } catch (...) {
- return;
- }
- }
handleIncomingFile(conversationId, interactionId, info.totalSize);
}
--
GitLab