Account: Fix cert save/restore from settings. #2160

Without this fix, the section in the config file uses the wrong name,
leading to re-configuration of the client needed.

ChangeLog

@@ -1,6 +1,6 @@
 ChangeLog
 =========
-version 1.6.3 (release 2014-09-xx)
+version 1.6.3 (release 2014-09-03)
  * Fixed updater on OS X
  * Fixed memory leak in SSL button that could lead to quick memory draining
  * Fixed upload problem with files >4 GB

VERSION.cmake

@@ -4,7 +4,7 @@ set( MIRALL_VERSION_PATCH 3 )
 set( MIRALL_SOVERSION 0 )
 
 if ( NOT DEFINED MIRALL_VERSION_SUFFIX )
-	set( MIRALL_VERSION_SUFFIX "rc1") #e.g. beta1, beta2, rc1
+	set( MIRALL_VERSION_SUFFIX "") #e.g. beta1, beta2, rc1
 endif( NOT DEFINED MIRALL_VERSION_SUFFIX )
 
 if( NOT DEFINED MIRALL_VERSION_BUILD )

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;
     }

src/mirall/owncloudtheme.cpp

@@ -126,7 +126,7 @@ QPixmap ownCloudTheme::wizardHeaderLogo() const
 
 QString ownCloudTheme::appName() const
 {
-    return QLatin1String("owncloud");
+    return QLatin1String("ownCloud");
 }
 
 QString ownCloudTheme::appNameGUI() const