Timeline: Resize message if any attachment is no longer pending

signalapp · Sep 4, 2019 · dbc312e · dbc312e
1 parent 93ee9ae
commit dbc312e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 21 deletions.
diff --git a/ts/shims/Whisper.ts b/ts/shims/Whisper.ts
@@ -11,12 +11,3 @@ export function getBubbleProps(attributes: any) {
 
   return model.getPropsForBubble();
 }
-
-export function isVoiceFlag(flags: any): boolean {
-  // @ts-ignore
-  const protoFlags = window.textsecure.protobuf.AttachmentPointer.Flags;
-  const VOICE_MESSAGE_FLAG = protoFlags.VOICE_MESSAGE;
-
-  // tslint:disable-next-line no-bitwise
-  return Boolean(flags && flags & VOICE_MESSAGE_FLAG);
-}
diff --git a/ts/state/ducks/conversations.ts b/ts/state/ducks/conversations.ts
@@ -10,13 +10,8 @@ import {
   without,
 } from 'lodash';
 import { trigger } from '../../shims/events';
-import { isVoiceFlag } from '../../shims/Whisper';
 import { NoopActionType } from './noop';
-import {
-  AttachmentType,
-  isImageAttachment,
-  isVideoAttachment,
-} from '../../types/Attachment';
+import { AttachmentType } from '../../types/Attachment';
 
 // State
 
@@ -536,16 +531,12 @@ function hasMessageHeightChanged(
     return true;
   }
 
-  const singleVisualAttachmentNoLongerPending =
-    messageAttachments.length === 1 &&
+  const firstAttachmentNoLongerPending =
     previousAttachments[0] &&
     previousAttachments[0].pending &&
     messageAttachments[0] &&
-    (isImageAttachment(messageAttachments[0]) ||
-      isVideoAttachment(messageAttachments[0]) ||
-      isVoiceFlag(messageAttachments[0].flags)) &&
     !messageAttachments[0].pending;
-  if (singleVisualAttachmentNoLongerPending) {
+  if (firstAttachmentNoLongerPending) {
     return true;
   }