pull/1277/head
Audric Ackermann 5 years ago
parent 5d7ecc690d
commit cd516aab64
No known key found for this signature in database
GPG Key ID: 999F434D76324AD4

@ -1514,10 +1514,7 @@
);
window.lokiPublicChatAPI = null;
window.feeds = [];
messageReceiver = new textsecure.MessageReceiver(
mySignalingKey,
options
);
messageReceiver = new textsecure.MessageReceiver(mySignalingKey, options);
messageReceiver.addEventListener(
'message',
window.NewReceiver.handleMessageEvent
@ -1528,10 +1525,7 @@
initAPIs();
await initSpecialConversations();
messageReceiver = new textsecure.MessageReceiver(
mySignalingKey,
options
);
messageReceiver = new textsecure.MessageReceiver(mySignalingKey, options);
messageReceiver.addEventListener(
'message',
window.NewReceiver.handleMessageEvent

@ -177,7 +177,6 @@ async function handleBlocked(
) {
window.log.info('Setting these numbers as blocked:', blocked.numbers);
// blocked.numbers contains numbers
if (blocked.numbers) {
const currentlyBlockedNumbers = BlockedNumberController.getBlockedNumbers();
@ -200,13 +199,14 @@ async function handleBlocked(
}
conv.trigger('change', conv);
} else {
window.console.warn('Did not find corresponding conversation to block', n);
window.console.warn(
'Did not find corresponding conversation to block',
n
);
}
}
await Promise.all(
toAddToBlocked.map(async n => markConvoBlocked(true, n))
);
await Promise.all(toAddToBlocked.map(async n => markConvoBlocked(true, n)));
await Promise.all(
toRemoveFromBlocked.map(async n => markConvoBlocked(false, n))

@ -106,9 +106,7 @@ export async function filterBlockedNumbers(
return [];
}
return conversations.filter(
c => c.isBlocked() && c.isPrivate()
);
return conversations.filter(c => c.isBlocked() && c.isPrivate());
}
// Serialise as <Element0.length><Element0><Element1.length><Element1>...

Loading…
Cancel
Save