diff --git a/src/app/appsettingsmanager.h b/src/app/appsettingsmanager.h
index 621204ff17864a0709284fb971c4fa92e47b8b21..fcc6b2bd0bc67260b319f13ee030ffa05bd1b06c 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 67f5781aea39408dc5a1845a14624eec3c7ddc55..90e255d453e7d5d06c4e230100379e7afc534310 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 3599828ac462d76aa71bd78244fe46bca8caf51d..24eb9f63e33bb1686e3669c6c5089d5b32241f45 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 799a1036af1fe277c80c9d134fb57c28e43daa9f..4141f8638c7772e774009709989b4826396719c7 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 829f17fa6b412da8d13925cc9c3906d05bf64a7c..76aa42d77ebe16a2d2cf4d4f99a0400747c710be 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 ca0e65834c5e5b4b4f100b5839768ac803f38bb9..049a3cda4dda337c489d40b5383c9447bfac9c83 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 3d5f0d3089eda5c809ae7c1cd0c874fa11e37616..7794fd2fa58767a09524c0a22ef50405f0d07ad8 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 c0c2c7a434ac9b4611b4a12b1300b52a0a933b6f..73c2bbfde299401b82d7f9a44eaa4bcac8671f81 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 c6e136e6398f970a7d775bdd5f173e544fe88365..0a4184ffb1ed8348b30676174e5d90a2755a0725 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);
}