diff options
author | Christian Kamm <kamm@incasoftware.de> | 2014-09-04 16:38:35 +0400 |
---|---|---|
committer | Markus Goetz <markus@woboq.com> | 2014-09-04 17:24:46 +0400 |
commit | cc1121ef008d85f2142c6a2887e3ee196061e97f (patch) | |
tree | b9c11e4b039b4a4fc410e891b69d4540b4b195c1 | |
parent | 6f9938a2b29d9ed9ffc3bf8cdefe68ce730303c3 (diff) |
Account: Fix cert save/restore from settings. #2160v1.6.3
-rw-r--r-- | src/mirall/account.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/mirall/account.cpp b/src/mirall/account.cpp index fc154b9b2..af3133155 100644 --- a/src/mirall/account.cpp +++ b/src/mirall/account.cpp @@ -39,6 +39,7 @@ static const char urlC[] = "url"; static const char authTypeC[] = "authType"; static const char userC[] = "user"; static const char httpUserC[] = "http_user"; +static const char caCertsKeyC[] = "CaCertificates"; AccountManager *AccountManager::_instance = 0; @@ -102,15 +103,15 @@ void Account::save() } settings->sync(); - // ### TODO port away from MirallConfigFile - MirallConfigFile cfg; + // Save accepted certificates. + settings->beginGroup(QLatin1String("General")); qDebug() << "Saving " << approvedCerts().count() << " unknown certs."; QByteArray certs; Q_FOREACH( const QSslCertificate& cert, approvedCerts() ) { certs += cert.toPem() + '\n'; } if (!certs.isEmpty()) { - cfg.setCaCerts( certs ); + settings->setValue( QLatin1String(caCertsKeyC), certs ); } } @@ -176,7 +177,7 @@ Account* Account::restore() // now the cert, it is in the general group settings->beginGroup(QLatin1String("General")); - acc->setApprovedCerts(QSslCertificate::fromData(settings->value(QLatin1String("CaCertificates")).toByteArray())); + acc->setApprovedCerts(QSslCertificate::fromData(settings->value(caCertsKeyC).toByteArray())); acc->setMigrated(migratedCreds); return acc; } |