Avoid unnecessary promise-wrapping
This commit is contained in:
parent
de077ba9af
commit
21a04d9de5
|
@ -458,19 +458,14 @@
|
|||
_converse.NUM_PREKEYS = 100; // Set here so that tests can override
|
||||
|
||||
function generateFingerprint (device) {
|
||||
return new Promise((resolve, reject) => {
|
||||
device.getBundle().then((bundle) => {
|
||||
if (_.isNil(bundle)) { resolve(); }
|
||||
|
||||
// TODO: only generate fingerprints when necessary
|
||||
crypto.subtle.digest('SHA-1', u.base64ToArrayBuffer(bundle['identity_key']))
|
||||
.then((fp) => {
|
||||
let bundle;
|
||||
return device.getBundle().then(b => {
|
||||
bundle = b;
|
||||
return crypto.subtle.digest('SHA-1', u.base64ToArrayBuffer(bundle['identity_key']));
|
||||
}).then(fp => {
|
||||
bundle['fingerprint'] = u.arrayBufferToHex(fp);
|
||||
device.save('bundle', bundle);
|
||||
device.trigger('change:bundle'); // Doesn't get triggered automatically due to pass-by-reference
|
||||
resolve();
|
||||
}).catch(reject);
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
|
@ -822,7 +817,6 @@
|
|||
const store = _converse.omemo_store,
|
||||
signed_prekey = store.get('signed_prekey');
|
||||
|
||||
return new Promise((resolve, reject) => {
|
||||
const stanza = $iq({
|
||||
'from': _converse.bare_jid,
|
||||
'type': 'set'
|
||||
|
@ -843,8 +837,7 @@
|
|||
stanza.c('preKeyPublic', {'preKeyId': prekey.keyId})
|
||||
.t(u.arrayBufferToBase64(prekey.keyPair.pubKey)).up();
|
||||
});
|
||||
_converse.connection.sendIQ(stanza, resolve, reject, _converse.IQ_TIMEOUT);
|
||||
});
|
||||
return _converse.api.sendIQ(stanza);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user