pull/1137/head
Audric Ackermann 5 years ago
parent e9e5a1508d
commit 2d26479177
No known key found for this signature in database
GPG Key ID: 999F434D76324AD4

@ -1818,10 +1818,11 @@
const otherDevices = await libloki.storage.getPairedDevicesFor(id); const otherDevices = await libloki.storage.getPairedDevicesFor(id);
const devices = [id, ...otherDevices]; const devices = [id, ...otherDevices];
const deviceConversations = await Promise.all(devices.map(d => ConversationController.getOrCreateAndWait( const deviceConversations = await Promise.all(
d, devices.map(d =>
'private' ConversationController.getOrCreateAndWait(d, 'private')
))); )
);
deviceConversations.forEach(device => { deviceConversations.forEach(device => {
if (device.isFriendRequestStatusNoneOrExpired()) { if (device.isFriendRequestStatusNoneOrExpired()) {
libloki.api.sendAutoFriendRequestMessage(device.id); libloki.api.sendAutoFriendRequestMessage(device.id);
@ -1831,7 +1832,6 @@
} }
}); });
if (details.profileKey) { if (details.profileKey) {
const profileKey = window.Signal.Crypto.arrayBufferToBase64( const profileKey = window.Signal.Crypto.arrayBufferToBase64(
details.profileKey details.profileKey

@ -2420,7 +2420,10 @@
if (!message.isEndSession()) { if (!message.isEndSession()) {
if (dataMessage.expireTimer) { if (dataMessage.expireTimer) {
if (dataMessage.expireTimer !== conversationPrimary.get('expireTimer')) { if (
dataMessage.expireTimer !==
conversationPrimary.get('expireTimer')
) {
conversationPrimary.updateExpirationTimer( conversationPrimary.updateExpirationTimer(
dataMessage.expireTimer, dataMessage.expireTimer,
source, source,

Loading…
Cancel
Save