Merge pull request #5972 from nextcloud/bugfix/encrypt-problem-folders

Fix user-facing message about why encryption cannot yet be done
This commit is contained in:
Claudio Cambra 2023-08-23 04:44:53 +08:00 committed by GitHub
commit 32a2dd75f8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -329,10 +329,18 @@ void AccountSettings::doExpand()
}
}
bool AccountSettings::canEncryptOrDecrypt(const FolderStatusModel::SubFolderInfo* info) {
if (info->_folder->syncResult().status() != SyncResult::Status::Success) {
bool AccountSettings::canEncryptOrDecrypt(const FolderStatusModel::SubFolderInfo *info)
{
if (const auto folderSyncStatus = info->_folder->syncResult().status(); folderSyncStatus != SyncResult::Status::Success) {
auto message = tr("Please wait for the folder to sync before trying to encrypt it.");
if (folderSyncStatus == SyncResult::Status::Problem) {
message = tr("The folder has a minor sync problem. Encryption of this folder will be possible once it has synced successfully");
} else if (folderSyncStatus == SyncResult::Status::Error) {
message = tr("The folder has a sync error. Encryption of this folder will be possible once it has synced successfully");
}
QMessageBox msgBox;
msgBox.setText("Please wait for the folder to sync before trying to encrypt it.");
msgBox.setText(message);
msgBox.exec();
return false;
}