anotherim/anotherim-desktop
2
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

OMEMO: Make QR code fixed-resolution and the quiet zone ISO-conformant

Browse source
This commit is contained in:
mjk 2022-02-18 21:41:28 +00:00
parent 1309d7e2e4
commit 855a98c045
4 changed files with 32 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
main/data/theme.css
View file

@ -369,4 +369,8 @@ box.dino-input-error label.input-status-highlight-once {
.dino-call-window .own-video { .dino-call-window .own-video {
box-shadow: 0 0 2px 0 rgba(0,0,0,0.5); box-shadow: 0 0 2px 0 rgba(0,0,0,0.5);
} }
.qrcode-container {
background: white; /* Color of the quiet zone. MUST have the same "reflectance" as light modules of the QR code. */
}

1
plugins/omemo/data/contact_details_dialog.ui
View file

@ -278,7 +278,6 @@
<child> <child>
<object class="GtkBox"> <object class="GtkBox">
<property name="visible">True</property> <property name="visible">True</property>
<property name="margin">10</property>
<child> <child>
<object class="GtkImage" id="qrcode_image"> <object class="GtkImage" id="qrcode_image">
<property name="visible">True</property> <property name="visible">True</property>

18
plugins/omemo/src/ui/contact_details_dialog.vala
View file

@ -92,20 +92,14 @@ public class ContactDetailsDialog : Gtk.Dialog {
copy_button.clicked.connect(() => {Clipboard.get_default(get_display()).set_text(fingerprint, fingerprint.length);}); copy_button.clicked.connect(() => {Clipboard.get_default(get_display()).set_text(fingerprint, fingerprint.length);});
int sid = plugin.db.identity.row_with(plugin.db.identity.account_id, account.id)[plugin.db.identity.device_id]; int sid = plugin.db.identity.row_with(plugin.db.identity.account_id, account.id)[plugin.db.identity.device_id];
Pixbuf qr_pixbuf = new QRcode(@"xmpp:$(account.bare_jid)?omemo-sid-$(sid)=$(fingerprint)", 2).to_pixbuf();
qr_pixbuf = qr_pixbuf.scale_simple(150, 150, InterpType.NEAREST);
Pixbuf pixbuf = new Pixbuf( const int QUIET_ZONE_MODULES = 4; // MUST be at least 4
qr_pixbuf.colorspace, const int MODULE_SIZE_PX = 4; // arbitrary
qr_pixbuf.has_alpha, Pixbuf qr_pixbuf = new QRcode(@"xmpp:$(account.bare_jid)?omemo-sid-$(sid)=$(fingerprint)", 2).to_pixbuf(MODULE_SIZE_PX);
qr_pixbuf.bits_per_sample, qrcode_image.set_from_pixbuf(qr_pixbuf);
170, qrcode_image.margin = QUIET_ZONE_MODULES*MODULE_SIZE_PX;
170 qrcode_popover.get_style_context().add_class("qrcode-container");
);
pixbuf.fill(uint32.MAX);
qr_pixbuf.copy_area(0, 0, 150, 150, pixbuf, 10, 10);
qrcode_image.set_from_pixbuf(pixbuf);
show_qrcode_button.clicked.connect(qrcode_popover.popup); show_qrcode_button.clicked.connect(qrcode_popover.popup);
} }

29
plugins/omemo/vapi/libqrencode.vapi
View file

@ -36,15 +36,28 @@ namespace Qrencode {
[CCode (cname = "QRcode_encodeString")] [CCode (cname = "QRcode_encodeString")]
public QRcode (string str, int version = 0, ECLevel level = ECLevel.L, EncodeMode hint = EncodeMode.EIGHT_BIT, bool casesensitive = true); public QRcode (string str, int version = 0, ECLevel level = ECLevel.L, EncodeMode hint = EncodeMode.EIGHT_BIT, bool casesensitive = true);
public Pixbuf to_pixbuf() { public Pixbuf to_pixbuf(int module_size) {
uint8[] bitmap = new uint8[3*width*width]; GLib.assert(module_size > 0);
for (int i = 0; i < width*width; i++) { var src_w = width;
uint8 color = (data[i] & 1) == 1 ? 0 : 255; var src = data[0:width*width];
bitmap[i*3] = color; var dst_w = src_w*module_size;
bitmap[i*3+1] = color; var dst = new uint8[dst_w*dst_w*3];
bitmap[i*3+2] = color; for (int src_y = 0; src_y < src_w; src_y++) {
for (int repeat_y = 0; repeat_y < module_size; repeat_y++) {
var dst_y = src_y*module_size + repeat_y;
for (int src_x = 0; src_x < src_w; src_x++) {
uint8 color = (src[src_y*src_w + src_x] & 1) == 1 ? 0 : 255;
for (int repeat_x = 0; repeat_x < module_size; repeat_x++) {
var dst_x = src_x*module_size + repeat_x;
var px_idx = dst_y*dst_w + dst_x;
dst[px_idx*3+0] = color;
dst[px_idx*3+1] = color;
dst[px_idx*3+2] = color;
}
}
}
} }
return new Pixbuf.from_data(bitmap, Colorspace.RGB, false, 8, width, width, width*3); return new Pixbuf.from_data(dst, Colorspace.RGB, false, 8, dst_w, dst_w, dst_w*3);
} }
} }
} }