Merge pull request #7411 from nextcloud/backport/7408/stable-3.14

[stable-3.14] Change defaults of promptDeleteFiles to false
nextcloud · Oct 24, 2024 · ec0eed5 · ec0eed5
2 parents b108377 + 8c4350f
commit ec0eed5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/src/gui/application.cpp b/src/gui/application.cpp
@@ -165,6 +165,9 @@ bool Application::configVersionMigration()
     configFile.setLaunchOnSystemStartup(configFile.launchOnSystemStartup());
     Utility::setLaunchOnStartup(theme->appName(), theme->appNameGUI(), configFile.launchOnSystemStartup());
 
+    // default is now off to displaying dialog warning user of too many files deletion
+    configFile.setPromptDeleteFiles(false);
+
     // back up all old config files
     QStringList backupFilesList;
     QDir configDir(configFile.configPath());

diff --git a/src/libsync/configfile.cpp b/src/libsync/configfile.cpp
@@ -1041,7 +1041,7 @@ bool ConfigFile::showMainDialogAsNormalWindow() const {
 bool ConfigFile::promptDeleteFiles() const
 {
     QSettings settings(configFile(), QSettings::IniFormat);
-    return settings.value(QLatin1String(promptDeleteC), true).toBool();
+    return settings.value(QLatin1String(promptDeleteC), false).toBool();
 }
 
 void ConfigFile::setPromptDeleteFiles(bool promptDeleteFiles)