Migrate existing db files and save their journal path

Fixes: #9019

Author: TheOneRing

changelog/unreleased/9019

@@ -0,0 +1,14 @@
+Bugfix: A upgrade to 2.9 causes the usage of a new journal file
+
+We fixed a bug where the name of the sync journal was not properly saved to the settings.
+This caused a bug when migration to 2.9 to start with a new sync journal.
+
+This not only caused the loss of some selective sync settings, but also caused the display of the 
+
+```
+Multiple accounts are sharing the folder.
+This configuration is know to lead to dataloss and is no longer supported.
+Please consider removing this folder from the account and adding it again.
+```
+
+message.

src/common/syncjournaldb.h

@@ -50,7 +50,7 @@ class OCSYNC_EXPORT SyncJournalDb : public QObject
 
     /// Create a journal path for a specific configuration
     static QString makeDbName(const QString &localPath,
-        const QString &infix);
+        const QString &infix = QStringLiteral("journal"));
 
     static QString makeDbName(const QString &localPath,
         const QUrl &remoteUrl,

src/gui/folder.cpp

@@ -1338,9 +1338,4 @@ QString FolderDefinition::absoluteJournalPath() const
     return QDir(localPath).filePath(journalPath);
 }
 
-QString FolderDefinition::defaultJournalPath(AccountPtr account)
-{
-    return SyncJournalDb::makeDbName(localPath, QStringLiteral("journal"));
-}
-
 } // namespace OCC

src/gui/folder.h

@@ -101,9 +101,6 @@ class FolderDefinition
 
     /// journalPath relative to localPath.
     QString absoluteJournalPath() const;
-
-    /// Returns the relative journal path that's appropriate for this folder and account.
-    QString defaultJournalPath(AccountPtr account);
 };
 
 /**

src/gui/folderman.cpp

@@ -286,7 +286,16 @@ void FolderMan::setupFoldersHelper(QSettings &settings, AccountStatePtr account,
         FolderDefinition folderDefinition;
         settings.beginGroup(folderAlias);
         if (FolderDefinition::load(settings, folderAlias, &folderDefinition)) {
-            auto defaultJournalPath = folderDefinition.defaultJournalPath(account->account());
+            const auto defaultJournalPath = [&account, folderDefinition] {
+                // if we would have booth the 2.9.0 file name and the lagacy file
+                // with the md5 infix we prefer the 2.9.0 version
+                const auto path = SyncJournalDb::makeDbName(folderDefinition.localPath);
+                if (QFileInfo::exists(QDir(folderDefinition.localPath).filePath(path))) {
+                    return path;
+                }
+                // legacy name
+                return SyncJournalDb::makeDbName(folderDefinition.localPath, account->account()->url(), folderDefinition.targetPath, account->account()->credentials()->user());
+            }();
 
             // Migration: Old settings don't have journalPath
             if (folderDefinition.journalPath.isEmpty()) {
@@ -329,6 +338,9 @@ void FolderMan::setupFoldersHelper(QSettings &settings, AccountStatePtr account,
                 if (foldersWithPlaceholders)
                     f->setSaveInFoldersWithPlaceholders();
 
+                // save possible changes from the migration
+                f->saveToSettings();
+
                 scheduleFolder(f);
                 emit folderSyncStateChange(f);
             }
@@ -1011,7 +1023,7 @@ Folder *FolderMan::addFolder(AccountState *accountState, const FolderDefinition
 {
     // Choose a db filename
     auto definition = folderDefinition;
-    definition.journalPath = definition.defaultJournalPath(accountState->account());
+    definition.journalPath = SyncJournalDb::makeDbName(folderDefinition.localPath);
 
     if (!ensureJournalGone(definition.absoluteJournalPath())) {
         return nullptr;