Account Wizard: don't whitelist everything on the first sync if we still want to...

Issue: https://github.com/owncloud/client/pull/5340#issuecomment-274564441

diff --git a/src/gui/owncloudsetupwizard.cpp b/src/gui/owncloudsetupwizard.cpp
index 4d977e0a44667f04b4953606e6003b158fc22b86..24910f025a3fdc70b70bcf0420f965b1e99a5da6 100644 (file)
--- a/src/gui/owncloudsetupwizard.cpp
+++ b/src/gui/owncloudsetupwizard.cpp
@@ -533,9 +533,11 @@ void OwncloudSetupWizard::slotAssistantFinished( int result )
             if (f) {
                 f->journalDb()->setSelectiveSyncList(SyncJournalDb::SelectiveSyncBlackList,
                                                      _ocWizard->selectiveSyncBlacklist());
-                // The user already accepted the selective sync dialog. everything is in the white list
-                f->journalDb()->setSelectiveSyncList(SyncJournalDb::SelectiveSyncWhiteList,
+                if (!_ocWizard->isConfirmBigFolderChecked()) {
+                    // The user already accepted the selective sync dialog. everything is in the white list
+                    f->journalDb()->setSelectiveSyncList(SyncJournalDb::SelectiveSyncWhiteList,
                                                      QStringList() << QLatin1String("/"));
+                }
             }
             _ocWizard->appendToConfigurationLog(tr("<font color=\"green\"><b>Local sync folder %1 successfully created!</b></font>").arg(localFolder));
         }

diff --git a/src/gui/wizard/owncloudadvancedsetuppage.cpp b/src/gui/wizard/owncloudadvancedsetuppage.cpp
index ae6d6d81f91e2659b3f40a33badd42484f9ce1a4..8de9ee339a56e1be6a91a3613327f70777084ac9 100644 (file)
--- a/src/gui/wizard/owncloudadvancedsetuppage.cpp
+++ b/src/gui/wizard/owncloudadvancedsetuppage.cpp
@@ -215,6 +215,11 @@ QStringList OwncloudAdvancedSetupPage::selectiveSyncBlacklist() const
     return _selectiveSyncBlacklist;
 }
 
+bool OwncloudAdvancedSetupPage::isConfirmBigFolderChecked() const
+{
+    return _ui.rSyncEverything->isChecked() && _ui.confCheckBoxSize->isChecked();
+}
+
 bool OwncloudAdvancedSetupPage::validatePage()
 {
     if(!_created) {

diff --git a/src/gui/wizard/owncloudadvancedsetuppage.h b/src/gui/wizard/owncloudadvancedsetuppage.h
index 6b41477c605595e1d3f412c7dec6aa786a6acc87..3a1247290e7cfda49f94129d01e897165079c670 100644 (file)
--- a/src/gui/wizard/owncloudadvancedsetuppage.h
+++ b/src/gui/wizard/owncloudadvancedsetuppage.h
@@ -41,6 +41,7 @@ public:
   bool validatePage() Q_DECL_OVERRIDE;
   QString localFolder() const;
   QStringList selectiveSyncBlacklist() const;
+  bool isConfirmBigFolderChecked() const;
   void setRemoteFolder( const QString& remoteFolder);
   void setMultipleFoldersExist( bool exist );
   void directoriesCreated();

diff --git a/src/gui/wizard/owncloudwizard.cpp b/src/gui/wizard/owncloudwizard.cpp
index 887b6715d0254416e281fa2dbfaab010ccc894ea..6d85c5ffd32cfb218962bc8143d1f63ed9660698 100644 (file)
--- a/src/gui/wizard/owncloudwizard.cpp
+++ b/src/gui/wizard/owncloudwizard.cpp
@@ -108,6 +108,10 @@ QStringList OwncloudWizard::selectiveSyncBlacklist() const
     return _advancedSetupPage->selectiveSyncBlacklist();
 }
 
+bool OwncloudWizard::isConfirmBigFolderChecked() const
+{
+    return _advancedSetupPage->isConfirmBigFolderChecked();
+}
 
 QString OwncloudWizard::ocUrl() const
 {

diff --git a/src/gui/wizard/owncloudwizard.h b/src/gui/wizard/owncloudwizard.h
index 5c805cae4242dc2453a42daf8e68ad271aef8c78..ecb5510abf8ea496c584930880865e1e3c7f4b89 100644 (file)
--- a/src/gui/wizard/owncloudwizard.h
+++ b/src/gui/wizard/owncloudwizard.h
@@ -59,6 +59,7 @@ public:
     QString ocUrl() const;
     QString localFolder() const;
     QStringList selectiveSyncBlacklist() const;
+    bool isConfirmBigFolderChecked() const;
 
     void enableFinishOnResultWidget(bool enable);