thegamer/Cable-Desktop
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Add qr codes

Browse source
This commit is contained in:
lilia 2016-09-19 02:52:50 -07:00
parent f05d693994
commit 790407d42e
4 changed files with 34 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
background.html
View file

@ -304,6 +304,7 @@
{{ /has_their_key }} {{ /has_their_key }}
{{ #has_their_key }} {{ #has_their_key }}
<label> {{ yourSafetyNumberWith }} </label> <label> {{ yourSafetyNumberWith }} </label>
<div class='qr'></div>
<div class='key'> <div class='key'>
{{ #chunks }} <span>{{ . }}</span> {{ /chunks }} {{ #chunks }} <span>{{ . }}</span> {{ /chunks }}
</div> </div>

8
js/views/key_verification_view.js
View file

@ -17,7 +17,13 @@
this.loadTheirKey(), this.loadTheirKey(),
this.loadOurKey(), this.loadOurKey(),
]).then(this.generateSecurityNumber.bind(this)) ]).then(this.generateSecurityNumber.bind(this))
.then(this.render.bind(this)); .then(this.render.bind(this))
.then(this.makeQRCode.bind(this));
},
makeQRCode: function() {
new QRCode(this.$('.qr')[0]).makeCode(
dcodeIO.ByteBuffer.wrap(this.our_key).toString('base64')
);
}, },
loadTheirKey: function() { loadTheirKey: function() {
if (this.their_key) { if (this.their_key) {

15
stylesheets/_conversation.scss
View file

@ -61,7 +61,7 @@
.key-verification { .key-verification {
label { label {
display: block; display: block;
margin-bottom: 10px; margin: 10px 0;
font-size: $font-size-small; font-size: $font-size-small;
} }
@ -81,6 +81,19 @@
.placeholder { .placeholder {
font-weight: bold; font-weight: bold;
} }
.qr {
border-radius: 200px;
border: solid 1px $grey_l2;
width: 150px;
height: 150px;
text-align: center;
padding: 25px;
margin: 10px auto;
img {
display: inline-block;
max-width: 100%;
}
}
} }
.message-detail { .message-detail {

13
stylesheets/manifest.css
View file

@ -967,7 +967,7 @@ input.search {
.key-verification label { .key-verification label {
display: block; display: block;
margin-bottom: 10px; margin: 10px 0;
font-size: 0.92857em; } font-size: 0.92857em; }
.key-verification .key, .key-verification .placeholder { .key-verification .key, .key-verification .placeholder {
padding: 0 1em; padding: 0 1em;
@ -982,6 +982,17 @@ input.search {
border-radius: 5px; } border-radius: 5px; }
.key-verification .placeholder { .key-verification .placeholder {
font-weight: bold; } font-weight: bold; }
.key-verification .qr {
border-radius: 200px;
border: solid 1px #d9d9d9;
width: 150px;
height: 150px;
text-align: center;
padding: 25px;
margin: 10px auto; }
.key-verification .qr img {
display: inline-block;
max-width: 100%; }
.message-detail .key-conflict-dialogue { .message-detail .key-conflict-dialogue {
border-radius: 5px; border-radius: 5px;