Address review comments

pull/1134/head
Maxim Shishmarev 5 years ago
parent abde96bc1e
commit ec3c03dbd4

@ -718,7 +718,7 @@
const recipients = _.union(convo.get('members'), members);
const isMediumGroup = convo.get('is_medium_group');
const isMediumGroup = convo.isMediumGroup();
const updateObj = {
id: groupId,
@ -781,23 +781,22 @@
secretKey: groupSecretKeyHex,
});
const ev = new Event('group');
ev.groupDetails = {
id: groupId,
name: groupName,
members: allMembers,
recipients: allMembers,
active: true,
expireTimer: 0,
avatar: '',
secretKey: identityKeys.privKey,
senderKey,
is_medium_group: true,
const ev = {
groupDetails: {
id: groupId,
name: groupName,
members: allMembers,
recipients: allMembers,
active: true,
expireTimer: 0,
avatar: '',
secretKey: identityKeys.privKey,
senderKey,
is_medium_group: true,
},
confirm: () => {},
};
ev.confirm = () => {};
await onGroupReceived(ev);
const convo = await ConversationController.getOrCreateAndWait(
@ -822,25 +821,24 @@
const keypair = await libsignal.KeyHelper.generateIdentityKeyPair();
const groupId = StringView.arrayBufferToHex(keypair.pubKey);
const ev = new Event('group');
const primaryDeviceKey =
window.storage.get('primaryDevicePubKey') ||
textsecure.storage.user.getNumber();
const allMembers = [primaryDeviceKey, ...members];
ev.groupDetails = {
id: groupId,
name: groupName,
members: allMembers,
recipients: allMembers,
active: true,
expireTimer: 0,
avatar: '',
const ev = {
groupDetails: {
id: groupId,
name: groupName,
members: allMembers,
recipients: allMembers,
active: true,
expireTimer: 0,
avatar: '',
},
confirm: () => {},
};
ev.confirm = () => {};
await onGroupReceived(ev);
const convo = await ConversationController.getOrCreateAndWait(

@ -236,6 +236,9 @@
isBlocked() {
return BlockedNumberController.isBlocked(this.id);
},
isMediumGroup() {
return this.get('is_medium_group');
},
block() {
BlockedNumberController.block(this.id);
this.trigger('change');
@ -1782,7 +1785,7 @@
let dest = destination;
let numbers = groupNumbers;
if (this.get('is_medium_group')) {
if (this.isMediumGroup()) {
dest = this.id;
numbers = [destination];
options.isMediumGroup = true;
@ -2364,7 +2367,7 @@
async leaveGroup() {
const now = Date.now();
if (this.get('is_medium_group')) {
if (this.isMediumGroup()) {
// NOTE: we should probably remove sender keys for groupId,
// and its secret key, but it is low priority

@ -1478,7 +1478,7 @@
const c = this.getConversation();
// Don't bother sending sync messages to public chats
// or groups with sender keys
if (c && !c.isPublic() && !c.get('is_medium_group')) {
if (c && !c.isPublic() && !c.isMediumGroup()) {
this.sendSyncMessage();
}
}

@ -534,9 +534,7 @@ class LokiMessageAPI {
// Start polling for medium size groups as well (they might be in different swarms)
{
const convos = window
.getConversations()
.filter(c => c.get('is_medium_group'));
const convos = window.getConversations().filter(c => c.isMediumGroup());
const self = this;

@ -1445,7 +1445,7 @@ MessageReceiver.prototype.extend({
const ownDevice = await isOwnDevice(source);
let ev;
if (conversation.get('is_medium_group') && ownDevice) {
if (conversation.isMediumGroup() && ownDevice) {
// Data messages for medium groups don't arrive as sync messages. Instead,
// linked devices poll for group messages independently, thus they need
// to recognise some of those messages at their own.

@ -714,7 +714,7 @@ MessageSender.prototype = {
c.isClosedGroup() &&
!c.get('left') &&
c.isFriend() &&
!c.get('is_medium_group')
!c.isMediumGroup()
);
if (sessionGroups.length === 0) {
window.console.info('No closed group to sync.');

Loading…
Cancel
Save