fix(deltachat-jsonrpc): block in inner_get_backup_qr
#5439
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
The code was introduced in #4198 |
iequidoo
approved these changes
Apr 7, 2024
There was a problem hiding this comment.
I only think this comment should be fixed:
/// This call will fail if there is currently no concurrent call to
/// [`CommandApi::provide_backup`]. This call may block if the QR code is not yet
/// ready.
async fn get_backup_qr(&self, account_id: u32) -> Result<String> {
|
There is still a problem of what to do if |
link2xt
force-pushed
the
link2xt/qr-block
branch
from
555e3fb to
f142f0c
Compare
|
I added 10 second timeout to make sure we don't deadlock if provider fails to start or was |
This change avoids the race between `provide_backup` changing the state from NoProvider to Pending and a call to `get_backup_qr` or `get_backup_qr_svg`. With this change `get_backup_qr` and `get_backup_qr_svg` always block until QR code is available, even if `provide_backup` was not called yet.
link2xt
force-pushed
the
link2xt/qr-block
branch
from
ae0306a to
0ca29bb
Compare
9 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This change avoids the race between
provide_backupchanging the state from NoProvider to Pending and a call toget_backup_qrorget_backup_qr_svg. With this changeget_backup_qrandget_backup_qr_svgalways block until QR code is available,even if
provide_backupwas not called yet.Fixes #5431