adress review

pull/1183/head
Audric Ackermann 5 years ago
parent bd940a9f79
commit 77025d1afd
No known key found for this signature in database
GPG Key ID: 999F434D76324AD4

@ -1351,6 +1351,7 @@
timestamp: Date.now(), timestamp: Date.now(),
}); });
// Start handle ChatMessages (attachments/quote/preview/body) // Start handle ChatMessages (attachments/quote/preview/body)
// FIXME AUDRIC handle attachments, quote, preview
if (conversationType === Message.PRIVATE) { if (conversationType === Message.PRIVATE) {
await libsession await libsession
.getMessageQueue() .getMessageQueue()

@ -1,4 +1,4 @@
/* global _, textsecure, WebAPI, libsignal, OutgoingMessage, window, libloki */ /* global _, textsecure, WebAPI, libsignal, window, OutgoingMessage, libloki */
/* eslint-disable more/no-then, no-bitwise */ /* eslint-disable more/no-then, no-bitwise */

@ -15,11 +15,8 @@
// this.ongroup = this.onGroupSyncComplete.bind(this); // this.ongroup = this.onGroupSyncComplete.bind(this);
// receiver.addEventListener('groupsync', this.ongroup); // receiver.addEventListener('groupsync', this.ongroup);
const ourNumber = textsecure.storage.user.getNumber();
window.log.info('SyncRequest created. Sending config sync request...'); window.log.info('SyncRequest created. Sending config sync request...');
const { CONFIGURATION } = textsecure.protobuf.SyncMessage.Request.Type; const { CONFIGURATION } = textsecure.protobuf.SyncMessage.Request.Type;
const user = libsession.Types.PubKey.from(ourNumber);
const { RequestSyncMessage } = window.libsession.Messages.Outgoing; const { RequestSyncMessage } = window.libsession.Messages.Outgoing;
const requestConfigurationSyncMessage = new RequestSyncMessage({ const requestConfigurationSyncMessage = new RequestSyncMessage({
@ -28,7 +25,7 @@
}); });
await libsession await libsession
.getMessageQueue() .getMessageQueue()
.send(user, requestConfigurationSyncMessage); .sendSyncMessage(requestConfigurationSyncMessage);
window.log.info('SyncRequest now sending contact sync message...'); window.log.info('SyncRequest now sending contact sync message...');
const { CONTACTS } = textsecure.protobuf.SyncMessage.Request.Type; const { CONTACTS } = textsecure.protobuf.SyncMessage.Request.Type;
@ -36,7 +33,9 @@
timestamp: Date.now(), timestamp: Date.now(),
reqestType: CONTACTS, reqestType: CONTACTS,
}); });
await libsession.getMessageQueue().send(user, requestContactSyncMessage); await libsession
.getMessageQueue()
.sendSyncMessage(requestContactSyncMessage);
window.log.info('SyncRequest now sending group sync messsage...'); window.log.info('SyncRequest now sending group sync messsage...');
const { GROUPS } = textsecure.protobuf.SyncMessage.Request.Type; const { GROUPS } = textsecure.protobuf.SyncMessage.Request.Type;
@ -44,7 +43,7 @@
timestamp: Date.now(), timestamp: Date.now(),
reqestType: GROUPS, reqestType: GROUPS,
}); });
await libsession.getMessageQueue().send(user, requestGroupSyncMessage); await libsession.getMessageQueue().sendSyncMessage(requestGroupSyncMessage);
this.timeout = setTimeout(this.onTimeout.bind(this), 60000); this.timeout = setTimeout(this.onTimeout.bind(this), 60000);
} }

@ -149,9 +149,7 @@ export class MultiDeviceProtocol {
const pubKey = typeof user === 'string' ? new PubKey(user) : user; const pubKey = typeof user === 'string' ? new PubKey(user) : user;
const authorisations = await this.getPairingAuthorisations(pubKey); const authorisations = await this.getPairingAuthorisations(pubKey);
if (authorisations.length === 0) { if (authorisations.length === 0) {
const array: Array<PubKey> = new Array(); return [pubKey];
array.push(pubKey);
return array;
} }
const devices = _.flatMap( const devices = _.flatMap(
authorisations, authorisations,

Loading…
Cancel
Save