From 8f3be764d27839b2c9a2d178a9ad8cd61885bf8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Kl=C3=A4hn?= <39526136+Septias@users.noreply.github.com> Date: Tue, 19 Nov 2024 17:32:42 +0100 Subject: [PATCH] change: Use i.delta.chat in qr codes (#6223) 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 --- python/tests/test_3_offline.py | 2 +- src/securejoin.rs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/python/tests/test_3_offline.py b/python/tests/test_3_offline.py index f6eb248c1..dcd752d55 100644 --- a/python/tests/test_3_offline.py +++ b/python/tests/test_3_offline.py @@ -705,7 +705,7 @@ class TestOfflineChat: ac1 = acfactory.get_pseudo_configured_account() ac2 = acfactory.get_pseudo_configured_account() qr = ac1.get_setup_contact_qr() - assert qr.startswith("OPENPGP4FPR:") + assert qr.startswith("https://i.delta.chat") res = ac2.check_qr(qr) assert res.is_ask_verifycontact() assert not res.is_ask_verifygroup() diff --git a/src/securejoin.rs b/src/securejoin.rs index 96631fe01..6691ba92a 100644 --- a/src/securejoin.rs +++ b/src/securejoin.rs @@ -104,7 +104,7 @@ pub async fn get_securejoin_qr(context: &Context, group: Option) -> Resu context.scheduler.interrupt_inbox().await; } format!( - "OPENPGP4FPR:{}#a={}&g={}&x={}&i={}&s={}", + "https://i.delta.chat/#{}&a={}&g={}&x={}&i={}&s={}", fingerprint.hex(), self_addr_urlencoded, &group_name_urlencoded, @@ -119,7 +119,7 @@ pub async fn get_securejoin_qr(context: &Context, group: Option) -> Resu context.scheduler.interrupt_inbox().await; } format!( - "OPENPGP4FPR:{}#a={}&n={}&i={}&s={}", + "https://i.delta.chat/#{}&a={}&n={}&i={}&s={}", fingerprint.hex(), self_addr_urlencoded, self_name_urlencoded,