Skip to content

Commit 8f3be76

Browse files
authored
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
1 parent c181db6 commit 8f3be76

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

python/tests/test_3_offline.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -705,7 +705,7 @@ def test_qr_setup_contact(self, acfactory):
705705
ac1 = acfactory.get_pseudo_configured_account()
706706
ac2 = acfactory.get_pseudo_configured_account()
707707
qr = ac1.get_setup_contact_qr()
708-
assert qr.startswith("OPENPGP4FPR:")
708+
assert qr.startswith("https://i.delta.chat")
709709
res = ac2.check_qr(qr)
710710
assert res.is_ask_verifycontact()
711711
assert not res.is_ask_verifygroup()

src/securejoin.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ pub async fn get_securejoin_qr(context: &Context, group: Option<ChatId>) -> Resu
104104
context.scheduler.interrupt_inbox().await;
105105
}
106106
format!(
107-
"OPENPGP4FPR:{}#a={}&g={}&x={}&i={}&s={}",
107+
"https://i.delta.chat/#{}&a={}&g={}&x={}&i={}&s={}",
108108
fingerprint.hex(),
109109
self_addr_urlencoded,
110110
&group_name_urlencoded,
@@ -119,7 +119,7 @@ pub async fn get_securejoin_qr(context: &Context, group: Option<ChatId>) -> Resu
119119
context.scheduler.interrupt_inbox().await;
120120
}
121121
format!(
122-
"OPENPGP4FPR:{}#a={}&n={}&i={}&s={}",
122+
"https://i.delta.chat/#{}&a={}&n={}&i={}&s={}",
123123
fingerprint.hex(),
124124
self_addr_urlencoded,
125125
self_name_urlencoded,

0 commit comments

Comments
 (0)