mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-11-25 06:25:56 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #466 from nextcloud/fix_compile_warnings

Browse source 
Fix compile warnings
This commit is contained in:
Camila Ayres 2018-07-02 13:50:04 +02:00 committed by GitHub
commit 178edb97bc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 70 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/gui/accountsettings.cpp
View file

@ -304,6 +304,8 @@ void AccountSettings::slotEncryptionFlagSuccess(const QByteArray& fileId)
void AccountSettings::slotEncryptionFlagError(const QByteArray& fileId, int httpErrorCode)
{
Q_UNUSED(fileId);
Q_UNUSED(httpErrorCode);
qDebug() << "Error on the encryption flag";
}
@ -344,6 +346,8 @@ void AccountSettings::slotUploadMetadataSuccess(const QByteArray& folderId)
void AccountSettings::slotUpdateMetadataError(const QByteArray& folderId, int httpReturnCode)
{
Q_UNUSED(httpReturnCode);
const auto token = accountsState()->account()->e2e()->tokenForFolder(folderId);
auto unlockJob = new UnlockEncryptFolderApiJob(accountsState()->account(), folderId, token);
connect(unlockJob, &UnlockEncryptFolderApiJob::success,
@ -355,15 +359,23 @@ void AccountSettings::slotUpdateMetadataError(const QByteArray& folderId, int ht
void AccountSettings::slotLockForEncryptionError(const QByteArray& fileId, int httpErrorCode)
{
Q_UNUSED(fileId);
Q_UNUSED(httpErrorCode);
qCInfo(lcAccountSettings()) << "Locking error" << httpErrorCode;
}
void AccountSettings::slotUnlockFolderError(const QByteArray& fileId, int httpErrorCode)
{
Q_UNUSED(fileId);
Q_UNUSED(httpErrorCode);
qCInfo(lcAccountSettings()) << "Unlocking error!";
}
void AccountSettings::slotUnlockFolderSuccess(const QByteArray& fileId)
{
Q_UNUSED(fileId);
qCInfo(lcAccountSettings()) << "Unlocking success!";
}
@ -475,27 +487,41 @@ void AccountSettings::slotDecryptionFlagSuccess(const QByteArray& fileId)
}
}
void AccountSettings::slotDecryptionFlagError(const QByteArray& fileID, int httpReturnCode)
void AccountSettings::slotDecryptionFlagError(const QByteArray& fileId, int httpReturnCode)
{
Q_UNUSED(fileId);
Q_UNUSED(httpReturnCode);
qDebug() << "Error Setting the Decryption Flag";
}
void AccountSettings::slotUnlockForDecryptionError(const QByteArray& fileId, int httpReturnCode)
{
Q_UNUSED(fileId);
Q_UNUSED(httpReturnCode);
qDebug() << "Error unlocking folder after decryption";
}
void AccountSettings::slotDeleteMetadataError(const QByteArray& fileId, int httpReturnCode)
{
qDebug() << "Error deleting the metadata";
Q_UNUSED(fileId);
Q_UNUSED(httpReturnCode);
qDebug() << "Error deleting the metadata";
}
void AccountSettings::slotLockForDecryptionError(const QByteArray& fileId, int httpReturnCode)
{
qDebug() << "Error Locking for decryption";
Q_UNUSED(fileId);
Q_UNUSED(httpReturnCode);
qDebug() << "Error Locking for decryption";
}
void AccountSettings::slotSubfolderContextMenuRequested(const QModelIndex& index, const QPoint& pos)
{
Q_UNUSED(pos);
QMenu menu;
auto ac = menu.addAction(tr("Open folder"));
connect(ac, &QAction::triggered, this, &AccountSettings::slotOpenCurrentLocalSubFolder);

2
src/gui/accountstate.cpp
View file

@ -34,8 +34,8 @@ AccountState::AccountState(AccountPtr account)
, _state(AccountState::Disconnected)
, _connectionStatus(ConnectionValidator::Undefined)
, _waitingForNewCredentials(false)
, _maintenanceToConnectedDelay(60000 + (qrand() % (4 * 60000))) // 1-5min delay
, _notificationsEtagResponseHeader("*")
, _maintenanceToConnectedDelay(60000 + (qrand() % (4 * 60000))) // 1-5min delay
{
qRegisterMetaType<AccountState *>("AccountState*");

2
src/gui/creds/webflowcredentials.cpp
View file

@ -102,6 +102,8 @@ void WebFlowCredentials::askFromUser() {
}
void WebFlowCredentials::slotAskFromUserCredentialsProvided(const QString &user, const QString &pass, const QString &host) {
Q_UNUSED(host);
if (_user != user) {
qCInfo(lcWebFlowCredentials()) << "Authed with the wrong user!";

2
src/libsync/configfile.cpp
View file

@ -94,7 +94,7 @@ static chrono::milliseconds millisecondsValue(const QSettings &setting, const ch
chrono::milliseconds defaultValue)
{
return chrono::milliseconds(setting.value(QLatin1String(key), qlonglong(defaultValue.count())).toLongLong());
};
}
ConfigFile::ConfigFile()
{

2
src/libsync/logger.cpp
View file

@ -50,7 +50,7 @@ Logger::Logger(QObject *parent)
{
qSetMessagePattern("[%{function} \t%{message}");
#ifndef NO_MSG_HANDLER
// qInstallMessageHandler(mirallLogCatcher);
qInstallMessageHandler(mirallLogCatcher);
#else
Q_UNUSED(mirallLogCatcher)
#endif

8
src/libsync/propagatedownloadencrypted.cpp
View file

@ -106,10 +106,10 @@ bool PropagateDownloadEncrypted::decryptFile(QFile& tmpFile)
tmpFile.close();
QFile _tmpOutput(_propagator->getFilePath(tmpFileName), this);
bool fileDecrypted = EncryptionHelper::fileDecryption(_encryptedInfo.encryptionKey,
_encryptedInfo.initializationVector,
&tmpFile,
&_tmpOutput);
EncryptionHelper::fileDecryption(_encryptedInfo.encryptionKey,
_encryptedInfo.initializationVector,
&tmpFile,
&_tmpOutput);
qCDebug(lcPropagateDownloadEncrypted) << "Decryption finished" << tmpFile.fileName() << _tmpOutput.fileName();

59
src/libsync/propagateuploadencrypted.cpp
View file

@ -114,8 +114,10 @@ void PropagateUploadEncrypted::slotFolderLockedSuccessfully(const QByteArray& fi
void PropagateUploadEncrypted::slotFolderEncryptedMetadataError(const QByteArray& fileId, int httpReturnCode)
{
qCDebug(lcPropagateUploadEncrypted()) << "Error Getting the encrypted metadata. unlock the folder.";
unlockFolder();
Q_UNUSED(fileId);
Q_UNUSED(httpReturnCode);
qCDebug(lcPropagateUploadEncrypted()) << "Error Getting the encrypted metadata. unlock the folder.";
unlockFolder();
}
void PropagateUploadEncrypted::slotFolderEncryptedMetadataReceived(const QJsonDocument &json, int statusCode)
@ -207,14 +209,15 @@ void PropagateUploadEncrypted::slotFolderEncryptedMetadataReceived(const QJsonDo
void PropagateUploadEncrypted::slotUpdateMetadataSuccess(const QByteArray& fileId)
{
qCDebug(lcPropagateUploadEncrypted) << "Uploading of the metadata success, Encrypting the file";
QFileInfo outputInfo(_completeFileName);
Q_UNUSED(fileId);
qCDebug(lcPropagateUploadEncrypted) << "Uploading of the metadata success, Encrypting the file";
QFileInfo outputInfo(_completeFileName);
qCDebug(lcPropagateUploadEncrypted) << "Encrypted Info:" << outputInfo.path() << outputInfo.fileName() << outputInfo.size();
qCDebug(lcPropagateUploadEncrypted) << "Finalizing the upload part, now the actuall uploader will take over";
emit finalized(outputInfo.path() + QLatin1Char('/') + outputInfo.fileName(),
_item->_file.section(QLatin1Char('/'), 0, -2) + QLatin1Char('/') + outputInfo.fileName(),
outputInfo.size());
qCDebug(lcPropagateUploadEncrypted) << "Encrypted Info:" << outputInfo.path() << outputInfo.fileName() << outputInfo.size();
qCDebug(lcPropagateUploadEncrypted) << "Finalizing the upload part, now the actuall uploader will take over";
emit finalized(outputInfo.path() + QLatin1Char('/') + outputInfo.fileName(),
_item->_file.section(QLatin1Char('/'), 0, -2) + QLatin1Char('/') + outputInfo.fileName(),
outputInfo.size());
}
void PropagateUploadEncrypted::slotUpdateMetadataError(const QByteArray& fileId, int httpErrorResponse)
@ -226,30 +229,32 @@ void PropagateUploadEncrypted::slotUpdateMetadataError(const QByteArray& fileId,
void PropagateUploadEncrypted::slotFolderLockedError(const QByteArray& fileId, int httpErrorCode)
{
/* try to call the lock from 5 to 5 seconds
and fail if it's more than 5 minutes. */
QTimer::singleShot(5000, this, [this, fileId]{
if (!_currentLockingInProgress) {
qCDebug(lcPropagateUploadEncrypted) << "Error locking the folder while no other update is locking it up.";
qCDebug(lcPropagateUploadEncrypted) << "Perhaps another client locked it.";
qCDebug(lcPropagateUploadEncrypted) << "Abort";
return;
}
Q_UNUSED(httpErrorCode);
/* try to call the lock from 5 to 5 seconds
* and fail if it's more than 5 minutes. */
QTimer::singleShot(5000, this, [this, fileId]{
if (!_currentLockingInProgress) {
qCDebug(lcPropagateUploadEncrypted) << "Error locking the folder while no other update is locking it up.";
qCDebug(lcPropagateUploadEncrypted) << "Perhaps another client locked it.";
qCDebug(lcPropagateUploadEncrypted) << "Abort";
return;
}
// Perhaps I should remove the elapsed timer if the lock is from this client?
if (_folderLockFirstTry.elapsed() > /* five minutes */ 1000 * 60 * 5 ) {
qCDebug(lcPropagateUploadEncrypted) << "One minute passed, ignoring more attemps to lock the folder.";
return;
}
slotTryLock(fileId);
});
// Perhaps I should remove the elapsed timer if the lock is from this client?
if (_folderLockFirstTry.elapsed() > /* five minutes */ 1000 * 60 * 5 ) {
qCDebug(lcPropagateUploadEncrypted) << "One minute passed, ignoring more attemps to lock the folder.";
return;
}
slotTryLock(fileId);
});
qCDebug(lcPropagateUploadEncrypted) << "Folder" << fileId << "Coundn't be locked.";
qCDebug(lcPropagateUploadEncrypted) << "Folder" << fileId << "Coundn't be locked.";
}
void PropagateUploadEncrypted::slotFolderEncryptedIdError(QNetworkReply *r)
{
qCDebug(lcPropagateUploadEncrypted) << "Error retrieving the Id of the encrypted folder.";
Q_UNUSED(r);
qCDebug(lcPropagateUploadEncrypted) << "Error retrieving the Id of the encrypted folder.";
}
void PropagateUploadEncrypted::slotFolderEncryptedStatusError(int error)