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.

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

fix: accept QR codes with 'broken' JSON #6528

Merged
merged 8 commits into from
Feb 10, 2025
Merged

Conversation

r10s
Copy link
Member

@r10s r10s commented Feb 10, 2025

this converts old QR codes to the new format, in an hacky, but simple way, see #6518 for more details and for code snippet

then QR code change is esp. bad as ppl will have different versions for some days at least, weakening overall UX, esp. of first-time-users that may come to delta because of praised, seamless multidevice ... :)

i tested in deltachat/deltachat-ios#2595 that this actually fixes the problem, and there is no deeper issue with changed chashes or so - seemed not to be the case, at least, with this hack, core accepts QR codes from the released 1.52-and-before series

this hack gives user time to update, it can be removed after some months (we can also remove the old BACKUP qr code alltogether then)

we should still not wait too long with the PR as there are already versions out with the "new/bad" QR code (and growing, as new iOS installations will get the new format, one cannot revert a version, only pause rollout)

src/securejoin.rs Outdated Show resolved Hide resolved
src/securejoin.rs Outdated Show resolved Hide resolved
src/securejoin.rs Outdated Show resolved Hide resolved
@r10s
Copy link
Member Author

r10s commented Feb 10, 2025

ah, thanks, @link2xt for pushing a fix!

@r10s r10s enabled auto-merge (squash) February 10, 2025 15:17
@r10s
Copy link
Member Author

r10s commented Feb 10, 2025

i did another commit to move the fix-function out of unrelated securejoin.rs

enabled automerge

@r10s
Copy link
Member Author

r10s commented Feb 10, 2025

thanks a lot for quick help on this PR! ❤️

@r10s r10s merged commit 8bddd45 into main Feb 10, 2025
37 checks passed
@r10s r10s deleted the r10s/fix-broken-qr-code-json branch February 10, 2025 15:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
blocker bug Something is not working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants