diff --git a/src/gui/filedetails/sharemodel.cpp b/src/gui/filedetails/sharemodel.cpp index 4b29b3132a33..110cc2ed68b9 100644 --- a/src/gui/filedetails/sharemodel.cpp +++ b/src/gui/filedetails/sharemodel.cpp @@ -1321,7 +1321,7 @@ bool ShareModel::serverAllowsResharing() const bool ShareModel::isShareDisabledFolder() const { - return _isShareDisabledFolder; + return false; } QVariantList ShareModel::sharees() const diff --git a/src/libsync/discovery.cpp b/src/libsync/discovery.cpp index 4062bce1b627..dc9ed3b21130 100644 --- a/src/libsync/discovery.cpp +++ b/src/libsync/discovery.cpp @@ -1381,7 +1381,7 @@ void ProcessDirectoryJob::processFileAnalyzeLocalInfo( item->_e2eEncryptionMaximumAvailableStatus = EncryptionStatusEnums::fromEndToEndEncryptionApiVersion(_discoveryData->_account->capabilities().clientSideEncryptionVersion()); } postProcessLocalNew(); - if (item->isDirectory() && item->_instruction == CSYNC_INSTRUCTION_NEW && item->_direction == SyncFileItem::Up + /*if (item->isDirectory() && item->_instruction == CSYNC_INSTRUCTION_NEW && item->_direction == SyncFileItem::Up && _discoveryData->_account->capabilities().clientSideEncryptionVersion() >= 2.0) { OCC::SyncJournalFileRecord rec; _discoveryData->_statedb->findEncryptedAncestorForRecord(item->_file, &rec); @@ -1392,7 +1392,7 @@ void ProcessDirectoryJob::processFileAnalyzeLocalInfo( item->_status = SyncFileItem::NormalError; item->_errorString = tr("Creating nested encrypted folders is not supported yet."); } - } + }*/ finalize(); return;