Comparar commits

..

1 Commits

Autor SHA1 Mensagem Data
Olivier Goffart 1617c9d482 PropfindJob: fix xml parsing
It would only find the first property
2015-04-07 10:35:27 +02:00
3 arquivos alterados com 5 adições e 8 exclusões
+1 -5
Ver Arquivo
@@ -480,11 +480,7 @@ void Account::slotHandleErrors(QNetworkReply *reply , QList<QSslError> errors)
addApprovedCerts(approvedCerts);
// all ssl certs are known and accepted. We can ignore the problems right away.
// qDebug() << out << "Certs are known and trusted! This is not an actual error.";
// Warning: Do *not* use ignoreSslErrors() (without args) here:
// it permanently ignores all SSL errors for this host, even
// certificate changes.
reply->ignoreSslErrors(errors);
reply->ignoreSslErrors();
} else {
_treatSslErrorsAsFailure = true;
return;
+2 -1
Ver Arquivo
@@ -647,8 +647,9 @@ bool PropfindJob::finished()
if (type == QXmlStreamReader::StartElement) {
if (!curElement.isEmpty() && curElement.top() == QLatin1String("prop")) {
items.insert(reader.name().toString(), reader.readElementText());
} else {
curElement.push(reader.name().toString());
}
curElement.push(reader.name().toString());
}
if (type == QXmlStreamReader::EndElement) {
if(curElement.top() == reader.name()) {
+2 -2
Ver Arquivo
@@ -400,13 +400,13 @@ void PropagateDownloadFileQNAM::slotGetFinished()
_propagator->_journal->setDownloadInfo(_item._file, SyncJournalDb::DownloadInfo());
}
/* if(!_item._directDownloadUrl.isEmpty() && err != QNetworkReply::OperationCanceledError) {
if(!_item._directDownloadUrl.isEmpty() && err != QNetworkReply::OperationCanceledError) {
// If this was with a direct download, retry without direct download
qWarning() << "Direct download of" << _item._directDownloadUrl << "failed. Retrying through owncloud.";
_item._directDownloadUrl.clear();
start();
return;
}*/
}
// This gives a custom QNAM (by the user of libowncloudsync) to abort() a QNetworkReply in its metaDataChanged() slot and
// set a custom error string to make this a soft error. In contrast to the default hard error this won't bring down