From 653b8494f505d4be353f54ec234604c64625ba0f Mon Sep 17 00:00:00 2001 From: Klaas Freitag Date: Thu, 12 Jun 2014 16:53:46 +0200 Subject: [PATCH] FolderMan: Migrate folderlist if no folder definitions can be found and the account indicates that it was migrated. In that case, read the folder definitions from the ownCloud config directory. --- src/mirall/folderman.cpp | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/mirall/folderman.cpp b/src/mirall/folderman.cpp index 6c4b1b801..7aa08f4a3 100644 --- a/src/mirall/folderman.cpp +++ b/src/mirall/folderman.cpp @@ -13,10 +13,13 @@ */ #include "mirall/folderman.h" +#include "mirall/account.h" + #include "mirall/mirallconfigfile.h" #include "mirall/folder.h" #include "mirall/syncresult.h" #include "mirall/theme.h" +#include "mirall/accountmigrator.h" #include @@ -147,6 +150,15 @@ int FolderMan::setupFolders() dir.setFilter(QDir::Files | QDir::Hidden); QStringList list = dir.entryList(); + if( list.count() == 0 ) { + // maybe the account was just migrated. + Account *acc = AccountManager::instance()->account(); + if ( acc && acc->wasMigrated() ) { + AccountMigrator accMig; + list = accMig.migrateFolderDefinitons(); + } + } + foreach ( const QString& alias, list ) { Folder *f = setupFolderFromConfigFile( alias ); if( f ) {