- Make saving/restoring accounts work.

- Prepare for fetching quota

2 files changed, 13 insertions, 10 deletions

diff --git a/src/wizard/owncloudadvancedsetuppage.cpp b/src/wizard/owncloudadvancedsetuppage.cpp
index 5657c30ed..b72328921 100644
--- a/src/wizard/owncloudadvancedsetuppage.cpp
+++ b/src/wizard/owncloudadvancedsetuppage.cpp
@@ -24,9 +24,11 @@
 #include "wizard/owncloudwizard.h"
 #include "wizard/owncloudwizardcommon.h"
 #include "wizard/owncloudadvancedsetuppage.h"
+#include "mirall/account.h"
 #include "mirall/theme.h"
 #include "mirall/mirallconfigfile.h"
 #include "creds/abstractcredentials.h"
+
 namespace Mirall
 {
 
@@ -135,21 +137,21 @@ void OwncloudAdvancedSetupPage::updateStatus()
 bool OwncloudAdvancedSetupPage::dataChanged()
 {
     OwncloudWizard* ocWizard(dynamic_cast< OwncloudWizard* >(wizard()));
+    Account *oldAccount = AccountManager::instance()->account();
 
-    if (!ocWizard) {
+    if (!ocWizard || !oldAccount) {
         return false;
     }
 
-    MirallConfigFile cfgFile;
     const QString url(field("OCUrl").toString());
     AbstractCredentials* newCredentials(ocWizard->getCredentials());
-    AbstractCredentials* oldCredentials(cfgFile.getCredentials());
+    AbstractCredentials* oldCredentials(oldAccount->credentials());
     const bool differentCreds(oldCredentials->changed(newCredentials));
     delete newCredentials;
     const QString newLocalFolder(QDir::toNativeSeparators(_ui.pbSelectLocalFolder->text()));
     const QString oldLocalFolder(QDir::toNativeSeparators(_oldLocalFolder));
 
-    return ((url != cfgFile.ownCloudUrl()) || differentCreds || (oldLocalFolder != newLocalFolder));
+    return ((url != oldAccount->url().toString()) || differentCreds || (oldLocalFolder != newLocalFolder));
 }
 
 void OwncloudAdvancedSetupPage::startSpinner()
diff --git a/src/wizard/owncloudhttpcredspage.cpp b/src/wizard/owncloudhttpcredspage.cpp
index fc832bc37..1128a13cc 100644
--- a/src/wizard/owncloudhttpcredspage.cpp
+++ b/src/wizard/owncloudhttpcredspage.cpp
@@ -16,11 +16,13 @@
 
 #include "QProgressIndicator.h"
 
-#include "wizard/owncloudhttpcredspage.h"
-#include "mirall/theme.h"
-#include "wizard/owncloudwizardcommon.h"
 #include "creds/httpcredentials.h"
+#include "mirall/theme.h"
+#include "mirall/account.h"
 #include "mirall/mirallconfigfile.h"
+#include "wizard/owncloudhttpcredspage.h"
+#include "wizard/owncloudwizardcommon.h"
+#include "wizard/owncloudwizard.h"
 
 namespace Mirall
 {
@@ -65,12 +67,11 @@ void OwncloudHttpCredsPage::setupCustomization()
 void OwncloudHttpCredsPage::initializePage()
 {
     WizardCommon::initErrorLabel(_ui.errorLabel);
-    MirallConfigFile cfgFile;
-    HttpCredentials* httpCreds(dynamic_cast< HttpCredentials* >(cfgFile.getCredentials()));
 
+    OwncloudWizard* ocWizard = qobject_cast< OwncloudWizard* >(wizard());
+    HttpCredentials *httpCreds = qobject_cast<HttpCredentials*>(ocWizard->account()->credentials());
     if (httpCreds) {
         const QString user = httpCreds->user();
-
         if (!user.isEmpty()) {
             _ui.leUsername->setText(user);
         }