Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support persistent notifications #1536

Merged
merged 2 commits into from
May 22, 2024
Merged

Support persistent notifications #1536

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
94e3e25
Support persistent notifications
May 22, 2024
feba3cd
Don't need to set block missing error
May 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/message-poller.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,7 @@ void MessagePoller::processNotification(const SyncNotification& notification)
#if !defined(Q_OS_WIN32)
case SYNC_ERROR_ID_INVALID_PATH_ON_WINDOWS:
#endif
case SYNC_ERROR_ID_CASE_CONFLICT:
LastSyncError::instance()->flagRepoSyncError(repo_id, err_id);
break;
}
Expand Down Expand Up @@ -211,6 +212,9 @@ void MessagePoller::processNotification(const SyncNotification& notification)
case SYNC_ERROR_ID_CHECKOUT_FILE:
msg = tr("Failed to download file %1. Please check disk space or folder permissions").arg(path);
break;
case SYNC_ERROR_ID_CASE_CONFLICT:
msg = tr("Path has character case conflict with existing file or folder. Will not be downloaded");
break;
default:
qWarning("Unknown sync error id %d", err_id);
json_decref(object);
Expand Down