prekey id must be an int.

c4ac73cc · JC Brand · ca9229a9 · c4ac73cc
Commit c4ac73cc authored Aug 18, 2018 by JC Brand
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 10 deletions

src/converse-omemo.js src/converse-omemo.js +9 -10

No files found.
--- a/src/converse-omemo.js
+++ b/src/converse-omemo.js
@@ -475,16 +475,15 @@
                            'identity_keypair': identity_keypair,
                            'prekeys': {}
                        };
-                        const signed_prekey_id = '0';
+                        libsignal.KeyHelper.generateSignedPreKey(identity_keypair, 0)
-                        libsignal.KeyHelper.generateSignedPreKey(identity_keypair, signed_prekey_id)
+                        .then((signed_prekey) => {
-                            .then((signed_prekey) => {
+                            data['signed_prekey'] = signed_prekey;
-                                data['signed_prekey'] = signed_prekey;
+                            const key_promises = _.map(_.range(0, _converse.NUM_PREKEYS), (id) => libsignal.KeyHelper.generatePreKey(id));
-                                const key_promises = _.map(_.range(0, _converse.NUM_PREKEYS), (id) => libsignal.KeyHelper.generatePreKey(id));
+                            Promise.all(key_promises).then((keys) => {
-                                Promise.all(key_promises).then((keys) => {
+                                data['prekeys'] = keys;
-                                    data['prekeys'] = keys;
+                                resolve(data)
-                                    resolve(data)
+                            });
-                                });
+                        }).catch(_.partial(_converse.log, _, Strophe.LogLevel.ERROR));
-                            }).catch(_.partial(_converse.log, _, Strophe.LogLevel.ERROR));
                    });
                }).catch(_.partial(_converse.log, _, Strophe.LogLevel.ERROR));
            }