Skip to content

Commit be47041

Browse files
committed
Fix QR Code exporting
1 parent c9d91bb commit be47041

4 files changed

Lines changed: 30 additions & 21 deletions

File tree

data/io.github.jhaygood86.mauborgne.appdata.xml.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</p>
1212
</description>
1313
<releases>
14-
<release version="0.3.0" date="2021-09-29" urgency="medium">
14+
<release version="0.3.1" date="2021-09-29" urgency="medium">
1515
<description>
1616
<p>Feature Release</p>
1717
<ul>

meson.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
project(
22
'io.github.jhaygood86.mauborgne', 'vala', 'c',
33
meson_version: '>= 0.49',
4-
version: '0.2.0'
4+
version: '0.3.1'
55
)
66

77
vapi_dir = meson.current_source_dir() / 'vapi'

src/OneTimePad.vala

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ public class OneTimePad {
131131
return file;
132132
}
133133

134-
public string to_uri () {
134+
public async string to_uri () {
135135
var sb = new StringBuilder ();
136136
sb.append("otpauth://");
137137

@@ -148,8 +148,12 @@ public class OneTimePad {
148148
sb.append(Uri.escape_string(issuer));
149149
sb.append(":");
150150
sb.append(Uri.escape_string(account_name));
151+
152+
var secret_value = yield lookup_secret ();
153+
151154
sb.append("?secret=");
152-
sb.append(secret);
155+
sb.append(secret_value);
156+
153157
sb.append("&issuer=");
154158
sb.append(Uri.escape_string(issuer));
155159

src/Widgets/ExportWindow.vala

Lines changed: 22 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -12,29 +12,34 @@ public class ExportWindow : Gtk.Window {
1212
var tmp_buffer = new uint8[qrcode_buffer_length];
1313
var qr_code = new uint8[qrcode_buffer_length];
1414

15-
var uri = pad.to_uri();
16-
print("uri: %s\n",uri);
15+
pad.to_uri.begin((obj,res) => {
1716

18-
var generated = QrCodegen.encode_text(uri, tmp_buffer, qr_code, QrCodegen.ECC.HIGH, QrCodegen.VERSION_MIN, QrCodegen.VERSION_MAX, QrCodegen.Mask.AUTO, true);
17+
var uri = pad.to_uri.end(res);
1918

20-
if (generated) {
21-
print("code generated\n");
22-
} else {
23-
print("code generation failed\n");
24-
}
19+
print("uri: %s\n",uri);
2520

26-
var qr_code_side_length = QrCodegen.get_size(qr_code);
21+
var generated = QrCodegen.encode_text(uri, tmp_buffer, qr_code, QrCodegen.ECC.HIGH, QrCodegen.VERSION_MIN, QrCodegen.VERSION_MAX, QrCodegen.Mask.AUTO, true);
2722

28-
print("side length: %d\n",qr_code_side_length);
23+
if (generated) {
24+
print("code generated\n");
25+
} else {
26+
print("code generation failed\n");
27+
}
2928

30-
var pixbuf = QrHelpers.get_pixbuf_from_qr_code(qr_code,qr_code_side_length);
29+
var qr_code_side_length = QrCodegen.get_size(qr_code);
3130

32-
var image = new Gtk.Image.from_pixbuf(pixbuf);
33-
image.visible = true;
34-
image.margin = 15 * 4;
35-
child = image;
31+
print("side length: %d\n",qr_code_side_length);
32+
33+
var pixbuf = QrHelpers.get_pixbuf_from_qr_code(qr_code,qr_code_side_length);
34+
35+
var image = new Gtk.Image.from_pixbuf(pixbuf);
36+
image.visible = true;
37+
image.margin = 15 * 4;
38+
child = image;
39+
40+
var context = get_style_context();
41+
context.add_class("export-window");
42+
});
3643

37-
var context = get_style_context();
38-
context.add_class("export-window");
3944
}
4045
}

0 commit comments

Comments
 (0)