fix avatar closed group and pubkey for medium mobile groups

ts/components/Avatar.tsx

@@ -91,9 +91,10 @@ export class Avatar extends React.PureComponent<Props, State> {
   }
 
   public render() {
-    const { avatarPath, size } = this.props;
+    const { avatarPath, size, memberAvatars } = this.props;
     const { imageBroken } = this.state;
-    const hasImage = avatarPath && !imageBroken;
+    const isClosedGroupAvatar = memberAvatars && memberAvatars.length;
+    const hasImage = avatarPath && !imageBroken && !isClosedGroupAvatar;
 
     if (
       size !== 28 &&

ts/components/ConversationListItem.tsx

@@ -312,7 +312,7 @@ class ConversationListItem extends React.PureComponent<Props> {
     const triggerId = `conversation-item-${phoneNumber}-ctxmenu`;
 
     return (
-      <div>
+      <div key={triggerId}>
         <ContextMenuTrigger id={triggerId}>
           <div
             role="button"

ts/components/session/usingClosedConversationDetails.tsx

@@ -27,7 +27,7 @@ export function usingClosedConversationDetails(WrappedComponent: any) {
       void this.fetchClosedConversationDetails();
     }
 
-    public componentDidUpdate() {
+    public componentWillReceiveProps() {
       void this.fetchClosedConversationDetails();
     }
 
@@ -66,7 +66,7 @@ export function usingClosedConversationDetails(WrappedComponent: any) {
           members.push(ourPrimary);
         }
         // no need to forward more than 2 conversations for rendering the group avatar
-        members.slice(0, 2);
+        members = members.slice(0, 2);
         const memberConvos = await Promise.all(
           members.map(async m =>
             window.ConversationController.getOrCreateAndWait(m.key, 'private')
@@ -79,10 +79,9 @@ export function usingClosedConversationDetails(WrappedComponent: any) {
             name: m.get('name') || m.get('profileName') || m.id,
           };
         });
-
-        if (!_.isEqual(memberAvatars, this.state.memberAvatars)) {
         this.setState({ memberAvatars });
-        }
+      } else {
+        this.setState({ memberAvatars: undefined });
       }
     }
   };

ts/receiver/contentMessage.ts

@@ -388,7 +388,7 @@ export async function innerHandleContentMessage(
   plaintext: ArrayBuffer
 ): Promise<void> {
   const { ConversationController } = window;
-
+  try {
     const content = SignalService.Content.decode(new Uint8Array(plaintext));
 
     const blocked = await isBlocked(envelope.source);
@@ -398,10 +398,11 @@ export async function innerHandleContentMessage(
         window.log.info('Dropping blocked user message');
         return;
       } else {
-      window.log.info('Allowing group-control message only from blocked user');
+        window.log.info(
+          'Allowing group-control message only from blocked user'
+        );
       }
     }
-
     const { FALLBACK_MESSAGE } = SignalService.Envelope.Type;
 
     await ConversationController.getOrCreateAndWait(envelope.source, 'private');
@@ -461,8 +462,9 @@ export async function innerHandleContentMessage(
       await handleTypingMessage(envelope, content.typingMessage);
       return;
     }
-
+  } catch (e) {
-  return;
+    window.log.warn(e);
+  }
 }
 
 function onReadReceipt(readAt: any, timestamp: any, reader: any) {

ts/session/types/PubKey.ts

@@ -1,17 +1,30 @@
 export class PubKey {
   public static readonly PUBKEY_LEN = 66;
+  private static readonly HEX = '[0-9a-fA-F]';
+
   // This is a temporary fix to allow groupPubkeys created from mobile to be handled correctly
   // They have a different regex to match
   // FIXME move this to a new class which validates group ids and use it in all places where we have group ids (message sending included)
-  public static readonly MOBILE_GROUP_PUBKEY_LEN = 32;
+  // tslint:disable: member-ordering
-  public static readonly regexForPubkeys = `((05)?[0-9a-fA-F]{${PubKey.PUBKEY_LEN -
+  public static readonly regexForPubkeys = `((05)?${PubKey.HEX}{64})`;
-    2}})`;
+  public static readonly PREFIX_GROUP_TEXTSECURE = '__textsecure_group__!';
 
-  private static readonly regexForMobileGroupID = `__textsecure_group__![0-9a-fA-F]{${PubKey.MOBILE_GROUP_PUBKEY_LEN}}`;
   // prettier-ignore
   private static readonly regex: RegExp = new RegExp(
-    `^${PubKey.regexForPubkeys}|${PubKey.regexForMobileGroupID}$`
+    `^(${PubKey.PREFIX_GROUP_TEXTSECURE})?(05)?(${PubKey.HEX}{64}|${PubKey.HEX}{32})$`
   );
+  /**
+   * If you want to update this regex. Be sure that those are matches ;
+   *  __textsecure_group__!05010203040506070809a0b0c0d0e0f0ff010203040506070809a0b0c0d0e0f0ff
+   *  __textsecure_group__!010203040506070809a0b0c0d0e0f0ff010203040506070809a0b0c0d0e0f0ff
+   *  __textsecure_group__!05010203040506070809a0b0c0d0e0f0ff
+   *  __textsecure_group__!010203040506070809a0b0c0d0e0f0ff
+   *  05010203040506070809a0b0c0d0e0f0ff010203040506070809a0b0c0d0e0f0ff
+   *  010203040506070809a0b0c0d0e0f0ff010203040506070809a0B0c0d0e0f0FF
+   *  05010203040506070809a0b0c0d0e0f0ff
+   *  010203040506070809a0b0c0d0e0f0ff
+   */
+
   public readonly key: string;
 
   /**