From 7692a46e17bcbc71a703035ce73e2a972d686593 Mon Sep 17 00:00:00 2001 From: JC Brand Date: Thu, 23 Aug 2018 11:01:49 +0200 Subject: [PATCH] Nonsencical to wrap a promise in try/catch --- src/converse-omemo.js | 32 +++++++++++++------------------- 1 file changed, 13 insertions(+), 19 deletions(-) diff --git a/src/converse-omemo.js b/src/converse-omemo.js index 7e27ba742..5b3487928 100644 --- a/src/converse-omemo.js +++ b/src/converse-omemo.js @@ -169,25 +169,19 @@ sessionBuilder = new libsignal.SessionBuilder(_converse.omemo_store, address), prekey = device.getRandomPreKey(); - try { - return sessionBuilder.processPreKey({ - 'registrationId': parseInt(_converse.omemo_store.get('device_id'), 10), - 'identityKey': u.base64ToArrayBuffer(_converse.omemo_store.get('identity_key')), - 'signedPreKey': { - 'keyId': bundle.signed_prekey.id, // - 'publicKey': u.base64ToArrayBuffer(bundle.signed_prekey.public_key), - 'signature': u.base64ToArrayBuffer(bundle.signed_prekey.signature) - }, - 'preKey': { - 'keyId': prekey.id, // - 'publicKey': u.base64ToArrayBuffer(prekey.key), - } - }); - } catch (e) { - _converse.log(`Error: could not build session for device ${device.get('id')}`, Strophe.LogLevel.ERROR); - _converse.log(e.message, Strophe.LogLevel.ERROR); - return Promise.resolve(); - } + return sessionBuilder.processPreKey({ + 'registrationId': parseInt(_converse.omemo_store.get('device_id'), 10), + 'identityKey': u.base64ToArrayBuffer(_converse.omemo_store.get('identity_key')), + 'signedPreKey': { + 'keyId': bundle.signed_prekey.id, // + 'publicKey': u.base64ToArrayBuffer(bundle.signed_prekey.public_key), + 'signature': u.base64ToArrayBuffer(bundle.signed_prekey.signature) + }, + 'preKey': { + 'keyId': prekey.id, // + 'publicKey': u.base64ToArrayBuffer(prekey.key), + } + }); }, getKeyAndTag (string) {