Fix various things from previous commits

pull/15/head
sachaaaaa 7 years ago
parent 886f47b8e7
commit b9dbf11ebc

@ -74,13 +74,13 @@
]); ]);
const preKeyMessage = new textsecure.protobuf.PreKeyBundleMessage({ const preKeyMessage = new textsecure.protobuf.PreKeyBundleMessage({
identityKey, identityKey: new Uint8Array(identityKey),
deviceId: 1, // TODO: fetch from somewhere deviceId: 1, // TODO: fetch from somewhere
preKeyId: preKey.keyId, preKeyId: preKey.keyId,
signedKeyId, signedKeyId,
preKey: preKey.pubKey, preKey: new Uint8Array(preKey.pubKey),
signedKey: signedKey.pubKey, signedKey: new Uint8Array(signedKey.pubKey),
signature: signedKey.signature, signature: new Uint8Array(signedKey.signature),
}); });
return preKeyMessage; return preKeyMessage;

@ -116,7 +116,7 @@ OutgoingMessage.prototype = {
if (updateDevices === undefined) { if (updateDevices === undefined) {
return this.server.getKeysForNumber(number).then(handleResult); return this.server.getKeysForNumber(number).then(handleResult);
} }
let promise = Promise.resolve(); let promise = Promise.resolve(true);
updateDevices.forEach(device => { updateDevices.forEach(device => {
promise = promise.then(() => promise = promise.then(() =>
Promise.all([ Promise.all([
@ -217,7 +217,7 @@ OutgoingMessage.prototype = {
request: requestMessage request: requestMessage
}); });
const bytes = new Uint8Array(websocketMessage.encode().toArrayBuffer()) const bytes = new Uint8Array(websocketMessage.encode().toArrayBuffer())
bytes.toString(); // print bytes for debugging purposes: can be injected in mock socket server console.log(bytes.toString()); // print bytes for debugging purposes: can be injected in mock socket server
return bytes; return bytes;
}, },
doSendMessage(number, deviceIds, recurse) { doSendMessage(number, deviceIds, recurse) {

Loading…
Cancel
Save