Timeline: Resize message if any attachment is no longer pending

This commit is contained in:
Scott Nonnenberg 2019-09-04 14:11:30 -07:00 committed by Ken Powers
parent 93ee9ae2b2
commit dbc312e189
2 changed files with 3 additions and 21 deletions

View file

@ -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);
}

View file

@ -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;
}