From a6dba7c6d6d69cc2f9c25ed2b7964552b2c33b09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Colomb?= Date: Fri, 22 Jul 2022 11:27:58 +0200 Subject: [PATCH] lib/model, lib/config: Apply sensible defaults for auto-accepted encrypted folder (fixes #8296) (#8427) * lib/model: Override scan config for auto-accepted encrypted folders. Encrypted folders should not have the fs watcher enabled and rarely benefit from a scheduled rescan. The GUI adjusts the suggested settings (watcher disabled, one day rescan interval) when accepting a receive-encrypted folder. Mirror that behavior to the auto-accept case where the GUI is not involved. Versioning also does not work well for encrypted folders, same treatment. --- lib/model/model.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/model/model.go b/lib/model/model.go index 042a69d3d..d64d01269 100644 --- a/lib/model/model.go +++ b/lib/model/model.go @@ -1675,6 +1675,11 @@ func (m *model) handleAutoAccepts(deviceID protocol.DeviceID, folder protocol.Fo if len(ccDeviceInfos.remote.EncryptionPasswordToken) > 0 || len(ccDeviceInfos.local.EncryptionPasswordToken) > 0 { fcfg.Type = config.FolderTypeReceiveEncrypted + // Override the user-configured defaults, as normally done by the GUI + fcfg.FSWatcherEnabled = false + fcfg.RescanIntervalS = 3600 * 24 + fcfg.Versioning.Reset() + // Other necessary settings are ensured by FolderConfiguration itself } else { ignores := m.cfg.DefaultIgnores() if err := m.setIgnores(fcfg, ignores.Lines); err != nil {