Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
This commit is contained in:
Kevin Ottens 2020-06-17 13:31:30 +02:00
parent 5afcf71e68
commit 76fbbfefa5
7 changed files with 8 additions and 8 deletions

View File

@ -552,7 +552,7 @@ void AccountSettings::slotSubfolderContextMenuRequested(const QModelIndex& index
auto info = _model->infoForIndex(index);
auto acc = _accountState->account();
if (acc->capabilities().clientSideEncryptionAvaliable()) {
if (acc->capabilities().clientSideEncryptionAvailable()) {
// Verify if the folder is empty before attempting to encrypt.
bool isEncrypted = acc->e2e()->isFolderEncrypted(info->_path);
@ -1023,7 +1023,7 @@ void AccountSettings::slotAccountStateChanged()
* if it has, do not offer to create one.
*/
qCInfo(lcAccountSettings) << "Account" << accountsState()->account()->displayName()
<< "Client Side Encryption" << accountsState()->account()->capabilities().clientSideEncryptionAvaliable();
<< "Client Side Encryption" << accountsState()->account()->capabilities().clientSideEncryptionAvailable();
}
}

View File

@ -583,7 +583,7 @@ void FolderStatusModel::fetchMore(const QModelIndex &parent)
//TODO: This is the correct place, but this doesn't seems to be the right
// Way to call fetchFolderEncryptedStatus.
if (_accountState->account()->capabilities().clientSideEncryptionAvaliable()) {
if (_accountState->account()->capabilities().clientSideEncryptionAvailable()) {
_accountState->account()->e2e()->fetchFolderEncryptedStatus();
}

View File

@ -84,7 +84,7 @@ bool Capabilities::shareResharing() const
return _capabilities["files_sharing"].toMap()["resharing"].toBool();
}
bool Capabilities::clientSideEncryptionAvaliable() const
bool Capabilities::clientSideEncryptionAvailable() const
{
auto it = _capabilities.constFind(QStringLiteral("end-to-end-encryption"));
if (it != _capabilities.constEnd())

View File

@ -57,7 +57,7 @@ public:
bool notificationsAvailable() const;
/// returns true if the server supports client side encryption
bool clientSideEncryptionAvaliable() const;
bool clientSideEncryptionAvailable() const;
/// returns true if the capabilities are loaded already.
bool isValid() const;

View File

@ -743,7 +743,7 @@ void ClientSideEncryption::setAccount(AccountPtr account)
void ClientSideEncryption::initialize()
{
qCInfo(lcCse()) << "Initializing";
if (!_account->capabilities().clientSideEncryptionAvaliable()) {
if (!_account->capabilities().clientSideEncryptionAvailable()) {
qCInfo(lcCse()) << "No Client side encryption available on server.";
emit initializationFinished();
return;

View File

@ -343,7 +343,7 @@ void PropagateDownloadFile::start()
qCDebug(lcPropagateDownload) << _item->_file << propagator()->_activeJobList.count();
if (propagator()->account()->capabilities().clientSideEncryptionAvaliable()) {
if (propagator()->account()->capabilities().clientSideEncryptionAvailable()) {
_downloadEncryptedHelper = new PropagateDownloadEncrypted(propagator(), _item);
connect(_downloadEncryptedHelper, &PropagateDownloadEncrypted::folderStatusNotEncrypted, [this] {
startAfterIsEncryptedIsChecked();

View File

@ -171,7 +171,7 @@ void PropagateUploadFileCommon::setDeleteExisting(bool enabled)
void PropagateUploadFileCommon::start()
{
if (propagator()->account()->capabilities().clientSideEncryptionAvaliable()) {
if (propagator()->account()->capabilities().clientSideEncryptionAvailable()) {
_uploadEncryptedHelper = new PropagateUploadEncrypted(propagator(), _item);
connect(_uploadEncryptedHelper, &PropagateUploadEncrypted::folderNotEncrypted,
this, &PropagateUploadFileCommon::setupUnencryptedFile);