fix "QR process failed" error and add a test #2725
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
before, a stale secure-join or setup-contact made the whole qr-scanning unusable until the app is restarted, resulting in "QR process failed" errors. this commit fixes the issue by aborting existing scans - in cases, a user really wants two concurrect joins running, this is not perfect, but that did not worked before as well.
|
@r10s Remove the |
|
Clippy is unhappy too |
link2xt
approved these changes
Oct 3, 2021
might be, yes. in general, however, ui call however, that is not really worth fixing as with #2508 we get of "ongoing" and "blocking" for all qr-joins :) |
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.
as already pointed out at #2611, the issue was that a stale/running secure-join/setup-contact made any subsequent joins unusable.
this pr aborts any existing secure-join/setup-contact, as it is also described in the docs ("Subsequent calls of dc_join_securejoin() will abort unfinished tasks")
nb: calls to stop_ongoing_process() does not help, however, in case of setup-contact the function is not blocking anyway (and the same is planned for secure-join)
fixes #2611