Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-05-03 13:26:28 +03:00
Code Issues Packages Projects Releases Wiki Activity

change: Use i.delta.chat in qr codes (#6223)

Browse Source 
As discussed in #5467 we want to use `i.delta.chat` in QR codes in favor
of `OPENPGP4FPR:` scheme. This PR does the replacement in
`get_securejoin_qr` which is used in `get_securejoin_qr_svg`.

close #5467
This commit is contained in:
Sebastian Klähn
2024-11-19 17:32:42 +01:00
committed by GitHub
parent c181db631f
commit 8f3be764d2
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
python/tests/test_3_offline.py
View File

@@ -705,7 +705,7 @@ class TestOfflineChat:
ac1 = acfactory.get_pseudo_configured_account() ac1 = acfactory.get_pseudo_configured_account()
ac2 = acfactory.get_pseudo_configured_account() ac2 = acfactory.get_pseudo_configured_account()
qr = ac1.get_setup_contact_qr() qr = ac1.get_setup_contact_qr()
assert qr.startswith("OPENPGP4FPR:") assert qr.startswith("https://i.delta.chat")
res = ac2.check_qr(qr) res = ac2.check_qr(qr)
assert res.is_ask_verifycontact() assert res.is_ask_verifycontact()
assert not res.is_ask_verifygroup() assert not res.is_ask_verifygroup()

4
src/securejoin.rs
View File

@@ -104,7 +104,7 @@ pub async fn get_securejoin_qr(context: &Context, group: Option<ChatId>) -> Resu
context.scheduler.interrupt_inbox().await; context.scheduler.interrupt_inbox().await;
} }
format!( format!(
"OPENPGP4FPR:{}#a={}&g={}&x={}&i={}&s={}", "https://i.delta.chat/#{}&a={}&g={}&x={}&i={}&s={}",
fingerprint.hex(), fingerprint.hex(),
self_addr_urlencoded, self_addr_urlencoded,
&group_name_urlencoded, &group_name_urlencoded,
@@ -119,7 +119,7 @@ pub async fn get_securejoin_qr(context: &Context, group: Option<ChatId>) -> Resu
context.scheduler.interrupt_inbox().await; context.scheduler.interrupt_inbox().await;
} }
format!( format!(
"OPENPGP4FPR:{}#a={}&n={}&i={}&s={}", "https://i.delta.chat/#{}&a={}&n={}&i={}&s={}",
fingerprint.hex(), fingerprint.hex(),
self_addr_urlencoded, self_addr_urlencoded,
self_name_urlencoded, self_name_urlencoded,