Merge branch 'clearnet' into revive-medium-groups

pull/1238/head
Maxim Shishmarev 5 years ago
commit d747249d4f

@ -698,7 +698,7 @@
return; return;
} }
const nullAvatar = ''; const nullAvatar = undefined;
if (avatar) { if (avatar) {
// would get to download this file on each client in the group // would get to download this file on each client in the group
// and reference the local file // and reference the local file
@ -771,7 +771,7 @@
recipients: allMembers, recipients: allMembers,
active: true, active: true,
expireTimer: 0, expireTimer: 0,
avatar: '', avatar: undefined,
}; };
await window.NewReceiver.onGroupReceived(groupDetails); await window.NewReceiver.onGroupReceived(groupDetails);

@ -511,6 +511,7 @@ export class LeftPaneMessageSection extends React.Component<Props, State> {
this.setState({ this.setState({
loading: false, loading: false,
}); });
this.handleToggleOverlay(undefined);
} }
} }

@ -74,7 +74,7 @@ export class SessionClosableOverlay extends React.Component<Props, State> {
overlayMode === SessionClosableOverlayType.ClosedGroup; overlayMode === SessionClosableOverlayType.ClosedGroup;
if (isClosedGroupView) { if (isClosedGroupView) {
filteredContactsList = filteredContactsList.filter( filteredContactsList = filteredContactsList.filter(
c => c.type === 'direct' c => c.type === 'direct' && !c.isMe
); );
} }

@ -43,6 +43,13 @@ export abstract class ClosedGroupUpdateMessage extends ClosedGroupMessage {
throw new Error('admins has not the correct type'); throw new Error('admins has not the correct type');
} }
if (
params.avatar !== undefined &&
!(params.avatar instanceof SignalService.AttachmentPointer)
) {
throw new Error('avatar has not the correct type');
}
this.name = params.name; this.name = params.name;
this.members = params.members; this.members = params.members;
this.admins = params.admins; this.admins = params.admins;

Loading…
Cancel
Save