Improve log output when migrating settings.

Signed-off-by: Camila Ayres <[email protected]>
nextcloud · Jan 29, 2025 · 53e7b9c · 53e7b9c
1 parent 0d966d7
commit 53e7b9c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/gui/accountmanager.cpp b/src/gui/accountmanager.cpp
@@ -168,7 +168,7 @@ void AccountManager::backwardMigrationSettingsKeys(QStringList *deleteKeys, QStr
         }
     } else {
         deleteKeys->append(settings->group());
-    }
+    }    
 }
 
 bool AccountManager::restoreFromLegacySettings()
@@ -273,9 +273,7 @@ bool AccountManager::restoreFromLegacySettings()
                         oCSettings->endGroup();
                     }
                 } else {
-                    // skip updater settings
-                    oCSettings->remove(QLatin1String(updaterC));
-                    qCInfo(lcAccountManager) << "Copy settings" << oCSettings->allKeys().join(", ");
+                    qCInfo(lcAccountManager) << "Copy settings:" << oCSettings->allKeys().join(", ");
                     settings = std::move(oCSettings);
                 }
 

diff --git a/src/gui/application.cpp b/src/gui/application.cpp
@@ -198,13 +198,16 @@ bool Application::configVersionMigration()
             QTimer::singleShot(0, qApp, &QCoreApplication::quit);
             return false;
         }
+    }
 
+    if (!deleteKeys.isEmpty()) {
         auto settings = ConfigFile::settingsWithGroup("foo");
         settings->endGroup();
 
         // Wipe confusing keys from the future, ignore the others
         for (const auto &badKey : std::as_const(deleteKeys)) {
             settings->remove(badKey);
+            qCInfo(lcApplication) << "Migration: removed" << badKey << "key from settings.";
         }
     }