{fileName}
- {isAttachmentNotAvailable ? (
-
-
-
+
+ {isAttachmentNotAvailable ? (
+
+
+
+ {i18n('icu:attachmentNotAvailable__file')}
+
-
- {i18n('icu:attachmentNotAvailable__file')}
+ ) : (
+
+ {formatFileSize(size)}
-
- ) : (
-
- {formatFileSize(size)}
-
- )}
+ )}
+ {text || shouldHideMetadata ? undefined : (
+
+
+
+ )}
+
);
}
+ public renderSimpleAttachmentNotAvailable(): JSX.Element | null {
+ const {
+ attachmentDroppedDueToSize,
+ attachments,
+ author,
+ i18n,
+ isSticker,
+ isTapToView,
+ isTapToViewError,
+ isTapToViewExpired,
+ readStatus,
+ showAttachmentNotAvailableModal,
+ showTapToViewNotAvailableModal,
+ text,
+ quote,
+ } = this.props;
+
+ const isAttachmentAudio = isAudio(attachments);
+ const withContentBelow = Boolean(text || attachmentDroppedDueToSize);
+ const withContentAbove = Boolean(quote) || this.#shouldRenderAuthor();
+ const isViewed = readStatus === ReadStatus.Viewed;
+
+ let attachmentType: string;
+ let info: string;
+ let attachmentModalType: AttachmentNotAvailableModalType | undefined;
+ let tapToViewModalType: TapToViewNotAvailableType | undefined;
+ if (isAttachmentAudio) {
+ attachmentType = 'audio';
+ info = i18n('icu:attachmentNotAvailable__voice');
+ attachmentModalType = AttachmentNotAvailableModalType.VoiceMessage;
+ } else if (isSticker) {
+ attachmentType = 'sticker';
+ info = i18n('icu:attachmentNotAvailable__sticker');
+ attachmentModalType = AttachmentNotAvailableModalType.Sticker;
+ } else if (isTapToView && !isViewed && isTapToViewExpired) {
+ attachmentType = 'tap-to-view';
+ info = i18n('icu:attachmentNotAvailable__tapToView');
+ tapToViewModalType = TapToViewNotAvailableType.Expired;
+ } else if (isTapToView && !isViewed && isTapToViewError) {
+ attachmentType = 'tap-to-view';
+ info = i18n('icu:attachmentNotAvailable__tapToViewCannotDownload');
+ tapToViewModalType = TapToViewNotAvailableType.Error;
+ } else {
+ assertDev(
+ false,
+ 'renderAttachment(): Invalid case for permanently undownloadable attachment'
+ );
+ return null;
+ }
+
+ const containerClassName = classNames(
+ 'module-message__undownloadable-attachment',
+ withContentAbove
+ ? 'module-message__undownloadable-attachment--with-content-above'
+ : null,
+ withContentBelow
+ ? 'module-message__undownloadable-attachment--with-content-below'
+ : null,
+ text ? null : 'module-message__undownloadable-attachment--no-text'
+ );
+ const iconClassName = classNames(
+ 'module-message__undownloadable-attachment__icon',
+ `module-message__undownloadable-attachment__icon--${attachmentType}`
+ );
+
+ return (
+
+
+
+
+ {info}
+
+
+
+
+
+
+ );
+ }
+
public renderUndownloadableTextAttachment(): JSX.Element | null {
const { i18n, textAttachment, showAttachmentNotAvailableModal } =
this.props;
if (!textAttachment || !isPermanentlyUndownloadable(textAttachment)) {
return null;
}
-
return (
);
}
- public renderTapToViewText(): string | undefined {
+ public renderTapToViewText(): { title: string; detail: string | undefined } {
const {
attachments,
direction,
i18n,
isTapToViewExpired,
isTapToViewError,
+ readStatus,
} = this.props;
- const isDownloadPending = this.isAttachmentPending();
- if (isDownloadPending) {
- return;
- }
- if (isTapToViewError) {
- return i18n('icu:incomingError');
- }
if (direction === 'outgoing') {
- return i18n('icu:Message--tap-to-view--outgoing');
+ return {
+ title: i18n('icu:Message--tap-to-view--media'),
+ detail: undefined,
+ };
}
- if (isTapToViewExpired) {
- return i18n('icu:Message--tap-to-view-expired');
+ if (readStatus === ReadStatus.Viewed) {
+ return {
+ title: i18n('icu:Message--tap-to-view--viewed'),
+ detail: undefined,
+ };
}
- if (isVideo(attachments)) {
- return i18n('icu:Message--tap-to-view--incoming-video');
+ if (isTapToViewExpired || isTapToViewError) {
+ throw new Error(
+ 'renderTapToViewText: This state is handled in renderSimpleAttachmentNotAvailable'
+ );
}
- return i18n('icu:Message--tap-to-view--incoming');
+
+ let detail = i18n('icu:Message--tap-to-view--helper-text');
+ const firstAttachment = attachments?.[0];
+ if (firstAttachment && !firstAttachment.path) {
+ detail = formatFileSize(firstAttachment.size);
+ }
+
+ if (isVideo(attachments) || isGIF(attachments)) {
+ return {
+ title: i18n('icu:Message--tap-to-view--video'),
+ detail,
+ };
+ }
+ return {
+ title: i18n('icu:Message--tap-to-view--photo'),
+ detail,
+ };
}
- public renderTapToView(): JSX.Element {
+ public renderTapToView(): JSX.Element | null {
const {
+ attachments,
+ attachmentDroppedDueToSize,
conversationType,
direction,
- isTapToViewExpired,
+ expirationLength,
+ expirationTimestamp,
+ i18n,
+ id,
isTapToViewError,
+ isTapToViewExpired,
+ pushPanelForConversation,
+ readStatus,
+ retryMessageSend,
+ showEditHistoryModal,
+ status,
+ timestamp,
} = this.props;
+ const firstAttachment = attachments?.[0];
+
+ const isIncoming = direction === 'incoming';
+ const isViewed = readStatus === ReadStatus.Viewed;
+ const isExpired = Boolean(
+ !isViewed &&
+ (isTapToViewExpired ||
+ (firstAttachment && isPermanentlyUndownloadable(firstAttachment)))
+ );
+ const isError = isTapToViewError || attachmentDroppedDueToSize;
+
const collapseMetadata =
this.#getMetadataPlacement() === MetadataPlacement.NotRendered;
- const withContentBelow = !collapseMetadata;
const withContentAbove =
!collapseMetadata &&
conversationType === 'group' &&
direction === 'incoming';
+ if (isIncoming && !isViewed && (isError || isExpired)) {
+ return this.renderSimpleAttachmentNotAvailable();
+ }
+
+ const text = this.renderTapToViewText();
+ let content: JSX.Element;
+ if (text.title && text.detail) {
+ content = (
+
+
+ {text.title}
+
+
+
+ {text.detail}
+
+ {collapseMetadata ? undefined : (
+
+
+
+ )}
+
+
+ );
+ } else {
+ content = (
+ <>
+
+ {text.title}
+
+ {collapseMetadata ? undefined : (
+
+
+
+ )}
+
+ );
+ }
+
return (
- {isTapToViewError ? null : this.renderTapToViewIcon()}
-
- {this.renderTapToViewText()}
-
+
this.renderTapToViewIcon()}
+ />
+ {content}
);
}
@@ -2689,28 +2974,29 @@ export class Message extends React.PureComponent
{
);
}
- public handleOpen = (
- event: React.KeyboardEvent | React.MouseEvent
- ): void => {
+ public handleOpen = (event: React.KeyboardEvent | React.MouseEvent): void => {
const {
attachments,
+ cancelAttachmentDownload,
contact,
- showLightboxForViewOnceMedia,
direction,
giftBadge,
id,
isSticker,
isTapToView,
+ isTapToViewError,
isTapToViewExpired,
kickOffAttachmentDownload,
- startConversation,
openGiftBadge,
pushPanelForConversation,
+ readStatus,
showAttachmentNotAvailableModal,
- showLightbox,
showExpiredIncomingTapToViewToast,
showExpiredOutgoingTapToViewToast,
+ showLightbox,
+ showLightboxForViewOnceMedia,
showMediaNoLongerAvailableToast,
+ startConversation,
} = this.props;
const { imageBroken } = this.state;
@@ -2721,6 +3007,38 @@ export class Message extends React.PureComponent {
return;
}
+ if (isTapToView) {
+ event.preventDefault();
+ event.stopPropagation();
+
+ if (direction === 'outgoing') {
+ showExpiredOutgoingTapToViewToast();
+ return;
+ }
+ if (readStatus === ReadStatus.Viewed) {
+ showExpiredIncomingTapToViewToast();
+ return;
+ }
+
+ if (isTapToViewError || isTapToViewExpired) {
+ // The only interactive element is the Learn More button
+ return;
+ }
+
+ if (attachments && !isDownloaded(attachments[0])) {
+ if (isDownloading(attachments[0])) {
+ cancelAttachmentDownload({ messageId: id });
+ } else {
+ kickOffAttachmentDownload({ messageId: id });
+ }
+ return;
+ }
+
+ showLightboxForViewOnceMedia(id);
+
+ return;
+ }
+
if (
attachments &&
attachments.length > 0 &&
@@ -2747,35 +3065,40 @@ export class Message extends React.PureComponent {
return;
}
- if (isTapToView) {
- if (isAttachmentPending) {
- log.info(
- ' handleOpen: tap-to-view attachment is pending; not showing the lightbox'
- );
- return;
- }
+ if (contact && contact.firstNumber && contact.serviceId) {
+ startConversation(contact.firstNumber, contact.serviceId);
event.preventDefault();
event.stopPropagation();
+ return;
+ }
+ if (contact) {
+ pushPanelForConversation({
+ type: PanelType.ContactDetails,
+ args: {
+ messageId: id,
+ },
+ });
- if (isTapToViewExpired) {
- const action =
- direction === 'outgoing'
- ? showExpiredOutgoingTapToViewToast
- : showExpiredIncomingTapToViewToast;
- action();
+ event.preventDefault();
+ event.stopPropagation();
+ return;
+ }
- return;
- }
+ if (this.isGenericAttachment(attachments, imageBroken)) {
+ this.openGenericAttachment();
+ return;
+ }
- if (attachments && !isDownloaded(attachments[0])) {
- kickOffAttachmentDownload({ messageId: id });
-
- return;
- }
-
- showLightboxForViewOnceMedia(id);
+ if (
+ isAudio(attachments) &&
+ this.audioButtonRef &&
+ this.audioButtonRef.current
+ ) {
+ event.preventDefault();
+ event.stopPropagation();
+ this.audioButtonRef.current.click();
return;
}
@@ -2809,63 +3132,6 @@ export class Message extends React.PureComponent {
const attachment = attachments[0];
showLightbox({ attachment, messageId: id });
-
- return;
- }
-
- if (
- attachments &&
- attachments.length === 1 &&
- !isAttachmentPending &&
- !isAudio(attachments)
- ) {
- event.preventDefault();
- event.stopPropagation();
-
- this.openGenericAttachment();
-
- return;
- }
-
- if (
- !isAttachmentPending &&
- isAudio(attachments) &&
- this.audioButtonRef &&
- this.audioButtonRef.current
- ) {
- event.preventDefault();
- event.stopPropagation();
-
- this.audioButtonRef.current.click();
- return;
- }
-
- if (contact && contact.firstNumber && contact.serviceId) {
- startConversation(contact.firstNumber, contact.serviceId);
-
- event.preventDefault();
- event.stopPropagation();
- return;
- }
-
- if (contact) {
- const signalAccount =
- contact.firstNumber && contact.serviceId
- ? {
- phoneNumber: contact.firstNumber,
- serviceId: contact.serviceId,
- }
- : undefined;
- pushPanelForConversation({
- type: PanelType.ContactDetails,
- args: {
- contact,
- signalAccount,
- },
- });
-
- event.preventDefault();
- event.stopPropagation();
}
};
@@ -2876,6 +3142,9 @@ export class Message extends React.PureComponent {
saveAttachment,
timestamp,
kickOffAttachmentDownload,
+ attachmentDroppedDueToSize,
+ showAttachmentNotAvailableModal,
+ cancelAttachmentDownload,
} = this.props;
if (event) {
@@ -2883,17 +3152,27 @@ export class Message extends React.PureComponent {
event.stopPropagation();
}
- if (!attachments || attachments.length !== 1) {
+ const firstAttachment = attachments?.[0];
+ if (!firstAttachment) {
return;
}
+ const isAttachmentNotAvailable =
+ isPermanentlyUndownloadable(firstAttachment) &&
+ !attachmentDroppedDueToSize;
- const attachment = attachments[0];
- if (!isDownloaded(attachment)) {
- kickOffAttachmentDownload({ messageId: id });
- return;
+ if (isAttachmentNotAvailable) {
+ showAttachmentNotAvailableModal(AttachmentNotAvailableModalType.File);
+ } else if (firstAttachment.pending) {
+ cancelAttachmentDownload({
+ messageId: id,
+ });
+ } else if (!firstAttachment.path) {
+ kickOffAttachmentDownload({
+ messageId: id,
+ });
+ } else {
+ saveAttachment(firstAttachment, timestamp);
}
-
- saveAttachment(attachment, timestamp);
};
public handleClick = (event: React.MouseEvent): void => {
@@ -2906,10 +3185,31 @@ export class Message extends React.PureComponent {
this.handleOpen(event);
};
+ public handleKeyDown = (event: React.KeyboardEvent): void => {
+ if (event.key !== 'Enter' && event.key !== ' ') {
+ return;
+ }
+
+ this.handleOpen(event);
+ };
+
+ private isGenericAttachment(
+ attachments: ReadonlyArray | undefined,
+ imageBroken: boolean
+ ) {
+ return (
+ attachments?.length &&
+ (!isImage(attachments) || imageBroken) &&
+ (!isVideo(attachments) || imageBroken) &&
+ !isAudio(attachments)
+ );
+ }
+
public renderContainer(): JSX.Element {
const {
attachments,
attachmentDroppedDueToSize,
+ contact,
conversationColor,
customColor,
deletedForEveryone,
@@ -2917,16 +3217,12 @@ export class Message extends React.PureComponent {
id,
isSticker,
isTapToView,
- isTapToViewExpired,
- isTapToViewError,
onContextMenu,
- onKeyDown,
text,
textDirection,
} = this.props;
- const { isTargeted } = this.state;
+ const { isTargeted, imageBroken } = this.state;
- const isAttachmentPending = this.isAttachmentPending();
const width = this.getWidth();
const isEmojiOnly = this.#canRenderStickerLikeEmoji();
const isStickerLike =
@@ -2942,30 +3238,24 @@ export class Message extends React.PureComponent {
direction === 'incoming' &&
!isStickerLike &&
(text || (!isVideo(attachments) && !isImage(attachments)));
+ const isClickable =
+ isTapToView ||
+ (this.isGenericAttachment(attachments, imageBroken) && !text) ||
+ contact;
const containerClassnames = classNames(
'module-message__container',
- isGIF(attachments) ? 'module-message__container--gif' : null,
+ isGIF(attachments) && !isTapToView
+ ? 'module-message__container--gif'
+ : null,
isTargeted ? 'module-message__container--targeted' : null,
lighterSelect ? 'module-message__container--targeted-lighter' : null,
!isStickerLike ? `module-message__container--${direction}` : null,
isEmojiOnly ? 'module-message__container--emoji' : null,
- isTapToView ? 'module-message__container--with-tap-to-view' : null,
- isTapToView && isTapToViewExpired
- ? 'module-message__container--with-tap-to-view-expired'
- : null,
!isStickerLike && direction === 'outgoing'
? `module-message__container--outgoing-${conversationColor}`
: null,
- isTapToView && isAttachmentPending && !isTapToViewExpired
- ? 'module-message__container--with-tap-to-view-pending'
- : null,
- isTapToView && isAttachmentPending && !isTapToViewExpired
- ? `module-message__container--${direction}-${conversationColor}-tap-to-view-pending`
- : null,
- isTapToViewError
- ? 'module-message__container--with-tap-to-view-error'
- : null,
+ isClickable ? 'module-message__container--is-clickable' : null,
this.#hasReactions() ? 'module-message__container--with-reactions' : null,
deletedForEveryone
? 'module-message__container--deleted-for-everyone'
@@ -2985,13 +3275,14 @@ export class Message extends React.PureComponent {
return (
+ {/* the keyboard handler is a level higher in hierarchy due to selection */}
+ {/* eslint-disable-next-line jsx-a11y/click-events-have-key-events */}
{
// Prevent double click from triggering the replyToMessage action
@@ -3037,7 +3328,6 @@ export class Message extends React.PureComponent
{
isSticker,
isSelected,
isSelectMode,
- onKeyDown,
platform,
renderMenu,
shouldCollapseAbove,
@@ -3085,7 +3375,7 @@ export class Message extends React.PureComponent {
onMouseDown: () => {
this.#hasSelectedTextRef.current = false;
},
- // We use `onClickCapture` here and preven default/stop propagation to
+ // We use `onClickCapture` here and prevent default/stop propagation to
// prevent other click handlers from firing.
onClickCapture: event => {
if (isMacOS ? event.metaKey : event.ctrlKey) {
@@ -3112,6 +3402,7 @@ export class Message extends React.PureComponent {
onReplyToMessage();
}
},
+ onKeyDown: event => this.handleKeyDown(event),
};
}
@@ -3150,7 +3441,6 @@ export class Message extends React.PureComponent {
// We need to have a role because screenreaders need to be able to focus here to
// read the message, but we can't be a button; that would break inner buttons.
role="row"
- onKeyDown={onKeyDown}
onFocus={this.handleFocus}
ref={this.focusRef}
// @ts-expect-error -- React/TS doesn't know about inert
diff --git a/ts/components/conversation/MessageAudio.tsx b/ts/components/conversation/MessageAudio.tsx
index 3c8708365d..40404b5d5a 100644
--- a/ts/components/conversation/MessageAudio.tsx
+++ b/ts/components/conversation/MessageAudio.tsx
@@ -23,6 +23,8 @@ import { WaveformScrubber } from './WaveformScrubber';
import { useComputePeaks } from '../../hooks/useComputePeaks';
import { durationToPlaybackText } from '../../util/durationToPlaybackText';
import { shouldNeverBeCalled } from '../../util/shouldNeverBeCalled';
+import { formatFileSize } from '../../util/formatFileSize';
+import { roundFractionForProgressBar } from '../../util/numbers';
export type OwnProps = Readonly<{
active:
@@ -47,6 +49,7 @@ export type OwnProps = Readonly<{
status?: MessageStatusType;
textPending?: boolean;
timestamp: number;
+ cancelAttachmentDownload(): void;
kickOffAttachmentDownload(): void;
onCorrupted(): void;
computePeaks(url: string, barCount: number): Promise;
@@ -154,6 +157,7 @@ export function MessageAudio(props: Props): JSX.Element {
textPending,
timestamp,
+ cancelAttachmentDownload,
kickOffAttachmentDownload,
onCorrupted,
setPlaybackRate,
@@ -275,23 +279,41 @@ export function MessageAudio(props: Props): JSX.Element {
);
let button: React.ReactElement;
- if (state === State.Pending || state === State.Computing) {
+ if (state === State.Computing) {
// Not really a button, but who cares?
button = (
);
+ } else if (state === State.Pending) {
+ // Not really a button, but who cares?
+ const downloadFraction =
+ attachment.size && attachment.totalDownloaded
+ ? roundFractionForProgressBar(
+ attachment.totalDownloaded / attachment.size
+ )
+ : undefined;
+ button = (
+
+ );
} else if (state === State.NotDownloaded) {
button = (
@@ -326,7 +352,7 @@ export function MessageAudio(props: Props): JSX.Element {
`${CSS_BASE}__countdown--${played ? 'played' : 'unplayed'}`
)}
>
- {durationToPlaybackText(countDown)}
+ {fileSizeOrDuration}
@@ -360,7 +386,6 @@ export function MessageAudio(props: Props): JSX.Element {
id={id}
isShowingImage={false}
isSticker={false}
- isTapToViewExpired={false}
pushPanelForConversation={pushPanelForConversation}
retryMessageSend={shouldNeverBeCalled}
status={status}
diff --git a/ts/components/conversation/MessageDetail.tsx b/ts/components/conversation/MessageDetail.tsx
index 15659cb37d..427c8b1295 100644
--- a/ts/components/conversation/MessageDetail.tsx
+++ b/ts/components/conversation/MessageDetail.tsx
@@ -108,6 +108,7 @@ export type PropsReduxActions = Pick<
| 'showLightboxForViewOnceMedia'
| 'showMediaNoLongerAvailableToast'
| 'showSpoiler'
+ | 'showTapToViewNotAvailableModal'
| 'startConversation'
| 'viewStory'
> & {
@@ -157,6 +158,7 @@ export function MessageDetail({
showLightboxForViewOnceMedia,
showMediaNoLongerAvailableToast,
showSpoiler,
+ showTapToViewNotAvailableModal,
startConversation,
theme,
toggleSafetyNumberModal,
@@ -373,6 +375,7 @@ export function MessageDetail({
showAttachmentDownloadStillInProgressToast
}
showAttachmentNotAvailableModal={showAttachmentNotAvailableModal}
+ showTapToViewNotAvailableModal={showTapToViewNotAvailableModal}
showExpiredIncomingTapToViewToast={
showExpiredIncomingTapToViewToast
}
diff --git a/ts/components/conversation/MessageMetadata.tsx b/ts/components/conversation/MessageMetadata.tsx
index 5aa438e351..339e34ff2d 100644
--- a/ts/components/conversation/MessageMetadata.tsx
+++ b/ts/components/conversation/MessageMetadata.tsx
@@ -32,7 +32,6 @@ type PropsType = {
isOutlineOnlyBubble?: boolean;
isShowingImage: boolean;
isSticker?: boolean;
- isTapToViewExpired?: boolean;
onWidthMeasured?: (width: number) => unknown;
pushPanelForConversation: PushPanelForConversationActionType;
retryMessageSend: (messageId: string) => unknown;
@@ -62,7 +61,6 @@ export const MessageMetadata = forwardRef
>(
isInline,
isShowingImage,
isSticker,
- isTapToViewExpired,
onWidthMeasured,
pushPanelForConversation,
retryMessageSend,
@@ -160,7 +158,6 @@ export const MessageMetadata = forwardRef>(
timestamp={timestamp}
withImageNoCaption={withImageNoCaption}
withSticker={isSticker}
- withTapToViewExpired={isTapToViewExpired}
/>
);
}
@@ -226,7 +223,6 @@ export const MessageMetadata = forwardRef>(
expirationTimestamp={expirationTimestamp}
withImageNoCaption={withImageNoCaption}
withSticker={isSticker}
- withTapToViewExpired={isTapToViewExpired}
/>
) : null}
{textPending ? (
@@ -251,9 +247,6 @@ export const MessageMetadata = forwardRef>(
: null,
isOutlineOnlyBubble
? 'module-message__metadata__status-icon--outline-only-bubble'
- : null,
- isTapToViewExpired
- ? 'module-message__metadata__status-icon--with-tap-to-view-expired'
: null
)}
/>
diff --git a/ts/components/conversation/MessageTimestamp.tsx b/ts/components/conversation/MessageTimestamp.tsx
index 58789b580b..0bfd444534 100644
--- a/ts/components/conversation/MessageTimestamp.tsx
+++ b/ts/components/conversation/MessageTimestamp.tsx
@@ -32,7 +32,6 @@ export function MessageTimestamp({
timestamp,
withImageNoCaption,
withSticker,
- withTapToViewExpired,
}: Readonly): ReactElement {
const now = useNowThatUpdatesEveryMinute();
const moduleName = module || 'module-timestamp';
@@ -42,9 +41,6 @@ export function MessageTimestamp({
className={classNames(
moduleName,
direction ? `${moduleName}--${direction}` : null,
- withTapToViewExpired && direction
- ? `${moduleName}--${direction}-with-tap-to-view-expired`
- : null,
withImageNoCaption ? `${moduleName}--with-image-no-caption` : null,
withSticker ? `${moduleName}--with-sticker` : null,
isOutlineOnlyBubble ? `${moduleName}--outline-only-bubble` : null
diff --git a/ts/components/conversation/Quote.stories.tsx b/ts/components/conversation/Quote.stories.tsx
index ec000c5706..99360270af 100644
--- a/ts/components/conversation/Quote.stories.tsx
+++ b/ts/components/conversation/Quote.stories.tsx
@@ -146,6 +146,7 @@ const defaultMessageProps: TimelineMessagesProps = {
'showExpiredOutgoingTapToViewToast'
),
showMediaNoLongerAvailableToast: action('showMediaNoLongerAvailableToast'),
+ showTapToViewNotAvailableModal: action('showTapToViewNotAvailableModal'),
toggleDeleteMessagesModal: action('default--toggleDeleteMessagesModal'),
toggleForwardMessagesModal: action('default--toggleForwardMessagesModal'),
showLightbox: action('default--showLightbox'),
@@ -267,6 +268,39 @@ ImageAttachment.args = {
},
};
+export const ImageAttachmentUndownloaded = Template.bind({});
+ImageAttachmentUndownloaded.args = {
+ rawAttachment: {
+ contentType: IMAGE_PNG,
+ fileName: 'sax.png',
+ isVoiceMessage: false,
+ thumbnail: {
+ contentType: IMAGE_PNG,
+ height: 100,
+ width: 100,
+ path: undefined,
+ size: 100000,
+ },
+ },
+};
+export const ImageAttachmentDownloading = Template.bind({});
+ImageAttachmentDownloading.args = {
+ rawAttachment: {
+ contentType: IMAGE_PNG,
+ fileName: 'sax.png',
+ isVoiceMessage: false,
+ thumbnail: {
+ contentType: IMAGE_PNG,
+ height: 100,
+ width: 100,
+ path: undefined,
+ pending: true,
+ size: 100000,
+ totalDownloaded: 75000,
+ },
+ },
+};
+
export const ImageAttachmentNoThumbnail = Template.bind({});
ImageAttachmentNoThumbnail.args = {
rawAttachment: {
@@ -322,6 +356,39 @@ VideoAttachment.args = {
},
};
+export const VideoAttachmentUndownloaded = Template.bind({});
+VideoAttachmentUndownloaded.args = {
+ rawAttachment: {
+ contentType: VIDEO_MP4,
+ fileName: 'great-video.mp4',
+ isVoiceMessage: false,
+ thumbnail: {
+ contentType: IMAGE_PNG,
+ height: 100,
+ width: 100,
+ path: undefined,
+ size: 100000,
+ },
+ },
+};
+export const VideoAttachmentDownloading = Template.bind({});
+VideoAttachmentDownloading.args = {
+ rawAttachment: {
+ contentType: VIDEO_MP4,
+ fileName: 'great-video.mp4',
+ isVoiceMessage: false,
+ thumbnail: {
+ contentType: IMAGE_PNG,
+ height: 100,
+ width: 100,
+ path: undefined,
+ pending: true,
+ size: 100000,
+ totalDownloaded: 75000,
+ },
+ },
+};
+
export const VideoAttachmentNoThumbnail = Template.bind({});
VideoAttachmentNoThumbnail.args = {
rawAttachment: {
diff --git a/ts/components/conversation/Timeline.stories.tsx b/ts/components/conversation/Timeline.stories.tsx
index 92fa9e8153..148fb3c0da 100644
--- a/ts/components/conversation/Timeline.stories.tsx
+++ b/ts/components/conversation/Timeline.stories.tsx
@@ -318,6 +318,7 @@ const actions = () => ({
'showExpiredOutgoingTapToViewToast'
),
showMediaNoLongerAvailableToast: action('showMediaNoLongerAvailableToast'),
+ showTapToViewNotAvailableModal: action('showTapToViewNotAvailableModal'),
toggleDeleteMessagesModal: action('toggleDeleteMessagesModal'),
toggleForwardMessagesModal: action('toggleForwardMessagesModal'),
diff --git a/ts/components/conversation/TimelineItem.stories.tsx b/ts/components/conversation/TimelineItem.stories.tsx
index 05c08c5d95..f849580c84 100644
--- a/ts/components/conversation/TimelineItem.stories.tsx
+++ b/ts/components/conversation/TimelineItem.stories.tsx
@@ -109,6 +109,7 @@ const getDefaultProps = () => ({
),
showAttachmentNotAvailableModal: action('showAttachmentNotAvailableModal'),
showMediaNoLongerAvailableToast: action('showMediaNoLongerAvailableToast'),
+ showTapToViewNotAvailableModal: action('showTapToViewNotAvailableModal'),
scrollToQuotedMessage: action('scrollToQuotedMessage'),
showSpoiler: action('showSpoiler'),
startConversation: action('startConversation'),
diff --git a/ts/components/conversation/TimelineMessage.stories.tsx b/ts/components/conversation/TimelineMessage.stories.tsx
index ad0b04acf9..c3e398c5f1 100644
--- a/ts/components/conversation/TimelineMessage.stories.tsx
+++ b/ts/components/conversation/TimelineMessage.stories.tsx
@@ -353,6 +353,7 @@ const createProps = (overrideProps: Partial = {}): Props => ({
'showExpiredOutgoingTapToViewToast'
),
showMediaNoLongerAvailableToast: action('showMediaNoLongerAvailableToast'),
+ showTapToViewNotAvailableModal: action('showTapToViewNotAvailableModal'),
toggleDeleteMessagesModal: action('toggleDeleteMessagesModal'),
toggleForwardMessagesModal: action('toggleForwardMessagesModal'),
showLightbox: action('showLightbox'),
@@ -374,7 +375,7 @@ const renderMany = (propsArray: ReadonlyArray) => (
<>
{propsArray.map((message, index) => (
) => (
);
-const renderThree = (props: Props) => renderMany([props, props, props]);
+const renderThree = (props: Props) =>
+ renderMany([
+ { ...props, shouldHideMetadata: true },
+ { ...props, shouldHideMetadata: true },
+ props,
+ ]);
const renderBothDirections = (props: Props) => (
<>
@@ -1050,6 +1056,110 @@ LinkPreviewWithSmallImage.args = {
text: 'Be sure to look at https://www.signal.org',
};
+export const LinkPreviewWithUndownloadedImage = Template.bind({});
+LinkPreviewWithUndownloadedImage.args = {
+ previews: [
+ {
+ domain: 'signal.org',
+ image: fakeAttachment({
+ contentType: IMAGE_PNG,
+ fileName: 'sax.png',
+ path: undefined,
+ size: 5300000,
+ }),
+ isStickerPack: false,
+ isCallLink: false,
+ title: 'Signal',
+ description:
+ 'Say "hello" to a different messaging experience. An unexpected focus on privacy, combined with all of the features you expect.',
+ url: 'https://www.signal.org',
+ date: new Date(2020, 2, 10).valueOf(),
+ },
+ ],
+ status: 'sent',
+ text: 'Be sure to look at https://www.signal.org',
+};
+
+export const LinkPreviewWithDownloadingImage = Template.bind({});
+LinkPreviewWithDownloadingImage.args = {
+ previews: [
+ {
+ domain: 'signal.org',
+ image: fakeAttachment({
+ contentType: IMAGE_PNG,
+ fileName: 'sax.png',
+ path: undefined,
+ pending: true,
+ size: 5300000,
+ totalDownloaded: 1230000,
+ }),
+ isStickerPack: false,
+ isCallLink: false,
+ title: 'Signal',
+ description:
+ 'Say "hello" to a different messaging experience. An unexpected focus on privacy, combined with all of the features you expect.',
+ url: 'https://www.signal.org',
+ date: new Date(2020, 2, 10).valueOf(),
+ },
+ ],
+ status: 'sent',
+ text: 'Be sure to look at https://www.signal.org',
+};
+
+export const LinkPreviewWithUndownloadedSmallImage = Template.bind({});
+LinkPreviewWithUndownloadedSmallImage.args = {
+ previews: [
+ {
+ domain: 'signal.org',
+ image: fakeAttachment({
+ contentType: IMAGE_PNG,
+ fileName: 'the-sax.png',
+ height: 50,
+ width: 50,
+ path: undefined,
+ size: 5300000,
+ }),
+ isStickerPack: false,
+ isCallLink: false,
+ title: 'Signal',
+ description:
+ 'Say "hello" to a different messaging experience. An unexpected focus on privacy, combined with all of the features you expect.',
+ url: 'https://www.signal.org',
+ date: new Date(2020, 2, 10).valueOf(),
+ },
+ ],
+ status: 'sent',
+ text: 'Be sure to look at https://www.signal.org',
+};
+
+export const LinkPreviewWithDownloadingSmallImage = Template.bind({});
+LinkPreviewWithDownloadingSmallImage.args = {
+ previews: [
+ {
+ domain: 'signal.org',
+ image: fakeAttachment({
+ contentType: IMAGE_PNG,
+ fileName: 'the-sax.png',
+ height: 50,
+ width: 50,
+ path: undefined,
+ pending: true,
+ size: 5300000,
+ totalDownloaded: 1230000,
+ }),
+ isStickerPack: false,
+ isCallLink: false,
+ title: 'Signal',
+ description:
+ 'Say "hello" to a different messaging experience. An unexpected focus on privacy, combined with all of the features you expect.',
+ url: 'https://www.signal.org',
+ date: new Date(2020, 2, 10).valueOf(),
+ },
+ ],
+ status: 'sent',
+ text: 'Be sure to look at https://www.signal.org',
+};
+
export const LinkPreviewWithoutImage = Template.bind({});
LinkPreviewWithoutImage.args = {
previews: [
@@ -1576,51 +1686,32 @@ PartialDownloadNotPendingGif.args = {
status: 'sent',
};
-export const _Audio = (): JSX.Element => {
- function Wrapper() {
- const [isPlayed, setIsPlayed] = React.useState(false);
+export const _Audio = Template.bind({});
+_Audio.args = {
+ attachments: [
+ fakeAttachment({
+ contentType: AUDIO_MP3,
+ fileName: 'incompetech-com-Agnus-Dei-X.mp3',
+ url: messageIdToAudioUrl['incompetech-com-Agnus-Dei-X'],
+ path: 'somepath',
+ }),
+ ],
+ status: 'read',
+ readStatus: ReadStatus.Read,
+};
- const messageProps = createProps({
- id: 'incompetech-com-Agnus-Dei-X',
- attachments: [
- fakeAttachment({
- contentType: AUDIO_MP3,
- fileName: 'incompetech-com-Agnus-Dei-X.mp3',
- url: messageIdToAudioUrl['incompetech-com-Agnus-Dei-X'],
- path: 'somepath',
- }),
- ],
- ...(isPlayed
- ? {
- status: 'viewed',
- readStatus: ReadStatus.Viewed,
- }
- : {
- status: 'read',
- readStatus: ReadStatus.Read,
- }),
- });
-
- return (
- <>
-
- {renderBothDirections(messageProps)}
-
- );
- }
-
- return ;
+export const AudioViewed = Template.bind({});
+AudioViewed.args = {
+ attachments: [
+ fakeAttachment({
+ contentType: AUDIO_MP3,
+ fileName: 'incompetech-com-Agnus-Dei-X.mp3',
+ url: messageIdToAudioUrl['incompetech-com-Agnus-Dei-X'],
+ path: 'somepath',
+ }),
+ ],
+ status: 'viewed',
+ readStatus: ReadStatus.Viewed,
};
export const LongAudio = Template.bind({});
@@ -1656,6 +1747,7 @@ AudioWithNotDownloadedAttachment.args = {
fakeAttachment({
contentType: AUDIO_MP3,
fileName: 'incompetech-com-Agnus-Dei-X.mp3',
+ path: undefined,
}),
],
status: 'sent',
@@ -1668,6 +1760,8 @@ AudioWithPendingAttachment.args = {
contentType: AUDIO_MP3,
fileName: 'incompetech-com-Agnus-Dei-X.mp3',
pending: true,
+ size: 1000000,
+ totalDownloaded: 570000,
}),
],
status: 'sent',
@@ -1678,8 +1772,65 @@ OtherFileType.args = {
attachments: [
fakeAttachment({
contentType: stringToMIMEType('text/plain'),
- fileName: 'my-resume.txt',
- url: 'my-resume.txt',
+ fileName: 'things.zip',
+ url: 'things.zip',
+ size: 10200000,
+ }),
+ ],
+ status: 'sent',
+};
+
+export const OtherFileTypeFourChar = Template.bind({});
+OtherFileTypeFourChar.args = {
+ attachments: [
+ fakeAttachment({
+ contentType: stringToMIMEType('text/plain'),
+ fileName: 'things.four',
+ url: 'things.four',
+ size: 10200000,
+ }),
+ ],
+ status: 'sent',
+};
+
+export const OtherFileTypeFiveChar = Template.bind({});
+OtherFileTypeFiveChar.args = {
+ attachments: [
+ fakeAttachment({
+ contentType: stringToMIMEType('text/plain'),
+ fileName: 'things.cinco',
+ url: 'things.cinco',
+ size: 10200000,
+ }),
+ ],
+ status: 'sent',
+};
+
+export const OtherFileTypeUndownloaded = Template.bind({});
+OtherFileTypeUndownloaded.args = {
+ attachments: [
+ fakeAttachment({
+ contentType: stringToMIMEType('text/plain'),
+ fileName: 'things.zip',
+ url: 'things.zip',
+ size: 10200000,
+ path: undefined,
+ }),
+ ],
+ status: 'sent',
+};
+
+export const OtherFileTypeDownloading = Template.bind({});
+OtherFileTypeDownloading.args = {
+ attachments: [
+ fakeAttachment({
+ contentType: stringToMIMEType('text/plain'),
+ fileName: 'things.zip',
+ url: 'things.zip',
+ size: 10200000,
+ path: undefined,
+ pending: true,
+ totalDownloaded: 7500000,
}),
],
status: 'sent',
@@ -1709,9 +1860,36 @@ OtherFileTypeWithLongFilename.args = {
}),
],
status: 'sent',
+};
+
+export const OtherFileTypeWithLongFilenameAndCaption = Template.bind({});
+OtherFileTypeWithLongFilenameAndCaption.args = {
+ attachments: [
+ fakeAttachment({
+ contentType: stringToMIMEType('text/plain'),
+ fileName:
+ 'INSERT-APP-NAME_INSERT-APP-APPLE-ID_AppStore_AppsGamesWatch.psd.zip',
+ url: 'a2/a2334324darewer4234',
+ }),
+ ],
+ status: 'sent',
text: 'This is what I have done.',
};
+export const DangerousFileType = Template.bind({});
+DangerousFileType.args = {
+ attachments: [
+ fakeAttachment({
+ contentType: stringToMIMEType(
+ 'application/vnd.microsoft.portable-executable'
+ ),
+ fileName: 'terrible.exe',
+ url: 'terrible.exe',
+ }),
+ ],
+ status: 'sent',
+};
+
export const TapToViewImage = Template.bind({});
TapToViewImage.args = {
attachments: [
@@ -1727,6 +1905,22 @@ TapToViewImage.args = {
status: 'sent',
};
+export const TapToViewImageInGroup = Template.bind({});
+TapToViewImageInGroup.args = {
+ attachments: [
+ fakeAttachment({
+ url: '/fixtures/tina-rolf-269345-unsplash.jpg',
+ fileName: 'tina-rolf-269345-unsplash.jpg',
+ contentType: IMAGE_JPEG,
+ width: 128,
+ height: 128,
+ }),
+ ],
+ isTapToView: true,
+ status: 'sent',
+ conversationType: 'group',
+};
+
export const TapToViewVideo = Template.bind({});
TapToViewVideo.args = {
attachments: [
@@ -1758,17 +1952,50 @@ TapToViewGif.args = {
status: 'sent',
};
-export const TapToViewExpired = Template.bind({});
-TapToViewExpired.args = {
+export const TapToViewImageUndownloaded = Template.bind({});
+TapToViewImageUndownloaded.args = {
attachments: [
fakeAttachment({
- url: '/fixtures/tina-rolf-269345-unsplash.jpg',
fileName: 'tina-rolf-269345-unsplash.jpg',
contentType: IMAGE_JPEG,
width: 128,
height: 128,
+ path: undefined,
+ size: 1800000,
}),
],
+ isTapToView: true,
+ status: 'sent',
+};
+
+export const TapToViewImageDownloading = Template.bind({});
+TapToViewImageDownloading.args = {
+ attachments: [
+ fakeAttachment({
+ fileName: 'tina-rolf-269345-unsplash.jpg',
+ contentType: IMAGE_JPEG,
+ width: 128,
+ height: 128,
+ path: undefined,
+ pending: true,
+ size: 1800000,
+ totalDownloaded: 500000,
+ }),
+ ],
+ isTapToView: true,
+ status: 'sent',
+};
+
+export const TapToViewViewed = Template.bind({});
+TapToViewViewed.args = {
+ readStatus: ReadStatus.Viewed,
+ isTapToView: true,
+ isTapToViewExpired: true,
+ status: 'sent',
+};
+
+export const TapToViewExpired = Template.bind({});
+TapToViewExpired.args = {
isTapToView: true,
isTapToViewExpired: true,
status: 'sent',
@@ -1776,34 +2003,11 @@ TapToViewExpired.args = {
export const TapToViewError = Template.bind({});
TapToViewError.args = {
- attachments: [
- fakeAttachment({
- url: '/fixtures/tina-rolf-269345-unsplash.jpg',
- fileName: 'tina-rolf-269345-unsplash.jpg',
- contentType: IMAGE_JPEG,
- width: 128,
- height: 128,
- }),
- ],
isTapToView: true,
isTapToViewError: true,
status: 'sent',
};
-export const DangerousFileType = Template.bind({});
-DangerousFileType.args = {
- attachments: [
- fakeAttachment({
- contentType: stringToMIMEType(
- 'application/vnd.microsoft.portable-executable'
- ),
- fileName: 'terrible.exe',
- url: 'terrible.exe',
- }),
- ],
- status: 'sent',
-};
-
export function Colors(): JSX.Element {
return (
<>
@@ -2058,6 +2262,75 @@ EmbeddedContactFullContact.args = {
contact: fullContact,
};
+export const EmbeddedContactAvatarUndownloaded = Template.bind({});
+EmbeddedContactAvatarUndownloaded.args = {
+ contact: {
+ ...fullContact,
+ avatar: {
+ avatar: fakeAttachment({
+ path: undefined,
+ contentType: IMAGE_GIF,
+ }),
+ isProfile: true,
+ },
+ },
+};
+export const EmbeddedContactAvatarDownloading = Template.bind({});
+EmbeddedContactAvatarDownloading.args = {
+ contact: {
+ ...fullContact,
+ avatar: {
+ avatar: fakeAttachment({
+ path: undefined,
+ pending: true,
+ contentType: IMAGE_GIF,
+ size: 1000000,
+ totalDownloaded: 500000,
+ }),
+ isProfile: true,
+ },
+ },
+};
+export const EmbeddedContactAvatarTransientError = Template.bind({});
+EmbeddedContactAvatarTransientError.args = {
+ contact: {
+ ...fullContact,
+ avatar: {
+ avatar: fakeAttachment({
+ iv: 'something',
+ key: 'something',
+ digest: 'something',
+ cdnKey: 'something',
+ cdnNumber: 2,
+ path: undefined,
+ error: true,
+ contentType: IMAGE_GIF,
+ size: 1000000,
+ totalDownloaded: 500000,
+ }),
+ isProfile: true,
+ },
+ },
+};
+export const EmbeddedContactAvatarPermanentError = Template.bind({});
+EmbeddedContactAvatarPermanentError.args = {
+ contact: {
+ ...fullContact,
+ avatar: {
+ avatar: fakeAttachment({
+ id: undefined,
+ key: undefined,
+ error: true,
+ path: undefined,
+ contentType: IMAGE_GIF,
+ size: 1000000,
+ totalDownloaded: 500000,
+ }),
+ isProfile: true,
+ },
+ },
+};
+
export const EmbeddedContactWithSendMessage = Template.bind({});
EmbeddedContactWithSendMessage.args = {
contact: {
@@ -2110,22 +2383,6 @@ EmbeddedContactFamilyName.args = {
},
};
-export const EmbeddedContactLoadingAvatar = Template.bind({});
-EmbeddedContactLoadingAvatar.args = {
- contact: {
- name: {
- nickname: 'Jerry',
- },
- avatar: {
- avatar: fakeAttachment({
- pending: true,
- contentType: IMAGE_GIF,
- }),
- isProfile: true,
- },
- },
-};
-
export const GiftBadgeUnopened = Template.bind({});
GiftBadgeUnopened.args = {
giftBadge: {
diff --git a/ts/components/conversation/contactUtil.tsx b/ts/components/conversation/contactUtil.tsx
index b93293c569..50e9a13f4c 100644
--- a/ts/components/conversation/contactUtil.tsx
+++ b/ts/components/conversation/contactUtil.tsx
@@ -6,45 +6,34 @@ import classNames from 'classnames';
import type { ReadonlyDeep } from 'type-fest';
import { Avatar, AvatarBlur } from '../Avatar';
-import { Spinner } from '../Spinner';
+import { AvatarColors } from '../../types/Colors';
+import { getName } from '../../types/EmbeddedContact';
+import { AttachmentStatusIcon } from './AttachmentStatusIcon';
import type { LocalizerType } from '../../types/Util';
-import { AvatarColors } from '../../types/Colors';
import type { EmbeddedContactType } from '../../types/EmbeddedContact';
-import { getName } from '../../types/EmbeddedContact';
+import { isPermanentlyUndownloadable } from '../../types/Attachment';
export function renderAvatar({
contact,
+ direction,
i18n,
size,
- direction,
}: {
contact: ReadonlyDeep;
- i18n: LocalizerType;
- size: 28 | 52 | 80;
direction?: 'outgoing' | 'incoming';
+ i18n: LocalizerType;
+ size: 52 | 80;
}): JSX.Element {
const { avatar } = contact;
const avatarUrl = avatar && avatar.avatar && avatar.avatar.path;
- const pending = avatar && avatar.avatar && avatar.avatar.pending;
const title = getName(contact) || '';
- const spinnerSvgSize = size < 50 ? 'small' : 'normal';
- const spinnerSize = size < 50 ? '24px' : undefined;
+ const isAttachmentNotAvailable = Boolean(
+ avatar?.avatar && isPermanentlyUndownloadable(avatar?.avatar)
+ );
- if (pending) {
- return (
-
-
-
- );
- }
-
- return (
+ const renderAttachmentDownloaded = () => (
);
+
+ return (
+
+ );
}
export function renderName({
diff --git a/ts/jobs/AttachmentDownloadManager.ts b/ts/jobs/AttachmentDownloadManager.ts
index 6fd5e3d852..32b315d5a9 100644
--- a/ts/jobs/AttachmentDownloadManager.ts
+++ b/ts/jobs/AttachmentDownloadManager.ts
@@ -53,6 +53,8 @@ import {
import { safeParsePartial } from '../util/schemas';
import { deleteDownloadsJobQueue } from './deleteDownloadsJobQueue';
import { createBatcher } from '../util/batcher';
+import { isOlderThan } from '../util/timestamp';
+import { ToastType } from '../types/Toast';
export enum AttachmentDownloadUrgency {
IMMEDIATE = 'immediate',
@@ -62,15 +64,17 @@ export enum AttachmentDownloadUrgency {
// Type for adding a new job
export type NewAttachmentDownloadJobType = {
attachment: AttachmentType;
+ attachmentType: AttachmentDownloadJobTypeType;
+ isManualDownload: boolean;
messageId: string;
receivedAt: number;
sentAt: number;
- attachmentType: AttachmentDownloadJobTypeType;
source: AttachmentDownloadSource;
urgency?: AttachmentDownloadUrgency;
};
const MAX_CONCURRENT_JOBS = 3;
+const DOWNLOAD_FAILED_TIMESTAMP_REST = 10 * durations.SECOND;
const DEFAULT_RETRY_CONFIG = {
maxAttempts: 5,
@@ -204,8 +208,9 @@ export class AttachmentDownloadManager extends JobManager {
const {
attachment,
- messageId,
attachmentType,
+ isManualDownload,
+ messageId,
receivedAt,
sentAt,
source,
@@ -219,15 +224,16 @@ export class AttachmentDownloadManager extends JobManager();
+
+function showDownloadFailedToast(messageId: string): void {
+ const now = Date.now();
+
+ for (const [id, timestamp] of lastErrorsByMessageId) {
+ if (isOlderThan(timestamp, DOWNLOAD_FAILED_TIMESTAMP_REST)) {
+ lastErrorsByMessageId.delete(id);
+ }
+ }
+
+ const existing = lastErrorsByMessageId.get(messageId);
+ if (!existing) {
+ window.reduxActions.toast.showToast({
+ toastType: ToastType.AttachmentDownloadFailed,
+ parameters: { messageId },
+ });
+ lastErrorsByMessageId.set(messageId, now);
+ }
+}
+
async function downloadBackupThumbnail({
attachment,
abortSignal,
diff --git a/ts/main/settingsChannel.ts b/ts/main/settingsChannel.ts
index 8afebba649..3397b7235e 100644
--- a/ts/main/settingsChannel.ts
+++ b/ts/main/settingsChannel.ts
@@ -84,6 +84,7 @@ export class SettingsChannel extends EventEmitter {
this.#installSetting('autoConvertEmoji');
this.#installSetting('autoDownloadUpdate');
+ this.#installSetting('autoDownloadAttachment');
this.#installSetting('autoLaunch');
this.#installSetting('alwaysRelayCalls');
diff --git a/ts/messageModifiers/ViewSyncs.ts b/ts/messageModifiers/ViewSyncs.ts
index 9b6c1f6d64..595bd57abd 100644
--- a/ts/messageModifiers/ViewSyncs.ts
+++ b/ts/messageModifiers/ViewSyncs.ts
@@ -10,13 +10,10 @@ import { GiftBadgeStates } from '../components/conversation/Message';
import { ReadStatus } from '../messages/MessageReadStatus';
import { getMessageIdForLogging } from '../util/idForLogging';
import { getMessageSentTimestamp } from '../util/getMessageSentTimestamp';
-import { isDownloaded } from '../types/Attachment';
import { isIncoming } from '../state/selectors/message';
import { markViewed } from '../services/MessageUpdater';
import { notificationService } from '../services/notifications';
-import { queueAttachmentDownloads } from '../util/queueAttachmentDownloads';
import { queueUpdateMessage } from '../util/messageBatcher';
-import { AttachmentDownloadUrgency } from '../jobs/AttachmentDownloadManager';
import { isAciString } from '../util/isAciString';
import { DataReader, DataWriter } from '../sql/Client';
import { MessageModel } from '../models/messages';
@@ -121,16 +118,6 @@ export async function onSync(sync: ViewSyncAttributesType): Promise {
if (message.get('readStatus') !== ReadStatus.Viewed) {
didChangeMessage = true;
message.set(markViewed(message.attributes, viewSync.viewedAt));
-
- const attachments = message.get('attachments');
- if (!attachments?.every(isDownloaded)) {
- const didQueueDownload = await queueAttachmentDownloads(message, {
- urgency: AttachmentDownloadUrgency.STANDARD,
- });
- if (didQueueDownload) {
- didChangeMessage = true;
- }
- }
}
const giftBadge = message.get('giftBadge');
diff --git a/ts/models/conversations.ts b/ts/models/conversations.ts
index 8638eb510a..00345e7a41 100644
--- a/ts/models/conversations.ts
+++ b/ts/models/conversations.ts
@@ -2307,8 +2307,10 @@ export class ConversationModel extends window.Backbone
await Promise.all(
readMessages.map(async m => {
const registered = window.MessageCache.register(new MessageModel(m));
- const shouldSave =
- await queueAttachmentDownloadsForMessage(registered);
+ const shouldSave = await queueAttachmentDownloadsForMessage(
+ registered,
+ { isManualDownload: false }
+ );
if (shouldSave) {
await window.MessageCache.saveMessage(registered.attributes);
}
diff --git a/ts/services/MessageUpdater.ts b/ts/services/MessageUpdater.ts
index bc526f79d4..58ab79b8a2 100644
--- a/ts/services/MessageUpdater.ts
+++ b/ts/services/MessageUpdater.ts
@@ -72,18 +72,17 @@ export async function markViewOnceMessageViewed(
): Promise {
const { fromSync } = options || {};
- if (!isValidTapToView(message.attributes)) {
- log.warn(
- `markViewOnceMessageViewed: Message ${getMessageIdForLogging(message.attributes)} is not a valid tap to view message!`
- );
- return;
- }
if (message.attributes.isErased) {
log.warn(
`markViewOnceMessageViewed: Message ${getMessageIdForLogging(message.attributes)} is already erased!`
);
return;
}
+ if (!isValidTapToView(message.attributes)) {
+ log.warn(
+ `markViewOnceMessageViewed: Message ${getMessageIdForLogging(message.attributes)} is not a valid tap to view message!`
+ );
+ }
if (message.get('readStatus') !== ReadStatus.Viewed) {
message.set(markViewed(message.attributes));
diff --git a/ts/services/backups/import.ts b/ts/services/backups/import.ts
index 0845e003ca..484e2fb807 100644
--- a/ts/services/backups/import.ts
+++ b/ts/services/backups/import.ts
@@ -658,6 +658,7 @@ export class BackupImportStream extends Writable {
attachmentDownloadJobPromises.push(
queueAttachmentDownloads(model, {
source: AttachmentDownloadSource.BACKUP_IMPORT,
+ isManualDownload: false,
})
);
}
diff --git a/ts/state/ducks/conversations.ts b/ts/state/ducks/conversations.ts
index 4ad4bc5156..6b6ead7724 100644
--- a/ts/state/ducks/conversations.ts
+++ b/ts/state/ducks/conversations.ts
@@ -2308,10 +2308,10 @@ function kickOffAttachmentDownload(
`kickOffAttachmentDownload: Message ${options.messageId} missing!`
);
}
- const didUpdateValues = await queueAttachmentDownloadsForMessage(
- message,
- AttachmentDownloadUrgency.IMMEDIATE
- );
+ const didUpdateValues = await queueAttachmentDownloadsForMessage(message, {
+ urgency: AttachmentDownloadUrgency.IMMEDIATE,
+ isManualDownload: true,
+ });
if (didUpdateValues) {
drop(window.MessageCache.saveMessage(message.attributes));
diff --git a/ts/state/ducks/globalModals.ts b/ts/state/ducks/globalModals.ts
index 1ba39aaa87..ceda879090 100644
--- a/ts/state/ducks/globalModals.ts
+++ b/ts/state/ducks/globalModals.ts
@@ -57,6 +57,7 @@ import { linkCallRoute } from '../../util/signalRoutes';
import type { StartCallData } from '../../components/ConfirmLeaveCallModal';
import { getMessageById } from '../../messages/getMessageById';
import type { AttachmentNotAvailableModalType } from '../../components/AttachmentNotAvailableModal';
+import type { DataPropsType as TapToViewNotAvailablePropsType } from '../../components/TapToViewNotAvailableModal';
// State
@@ -135,6 +136,7 @@ export type GlobalModalsStateType = ReadonlyDeep<{
safetyNumberChangedBlockingData?: SafetyNumberChangedBlockingDataType;
safetyNumberModalContactId?: string;
stickerPackPreviewId?: string;
+ tapToViewNotAvailableModalProps?: TapToViewNotAvailablePropsType;
userNotFoundModalState?: UserNotFoundModalStateType;
}>;
@@ -144,6 +146,10 @@ const SHOW_ATTACHMENT_NOT_AVAILABLE_MODAL =
'globalModals/SHOW_ATTACHMENT_NOT_AVAILABLE_MODAL';
const HIDE_ATTACHMENT_NOT_AVAILABLE_MODAL =
'globalModals/HIDE_ATTACHMENT_NOT_AVAILABLE_MODAL';
+const SHOW_TAP_TO_VIEW_NOT_AVAILABLE_MODAL =
+ 'globalModals/SHOW_TAP_TO_VIEW_NOT_AVAILABLE_MODAL';
+const HIDE_TAP_TO_VIEW_NOT_AVAILABLE_MODAL =
+ 'globalModals/HIDE_TAP_TO_VIEW_NOT_AVAILABLE_MODAL';
const HIDE_CONTACT_MODAL = 'globalModals/HIDE_CONTACT_MODAL';
const SHOW_CONTACT_MODAL = 'globalModals/SHOW_CONTACT_MODAL';
const HIDE_WHATS_NEW_MODAL = 'globalModals/HIDE_WHATS_NEW_MODAL_MODAL';
@@ -223,6 +229,15 @@ type ShowAttachmentNotAvailableModalActionType = ReadonlyDeep<{
payload: AttachmentNotAvailableModalType;
}>;
+type HideTapToViewNotAvailableModalActionType = ReadonlyDeep<{
+ type: typeof HIDE_TAP_TO_VIEW_NOT_AVAILABLE_MODAL;
+}>;
+
+type ShowTapToViewNotAvailableModalActionType = ReadonlyDeep<{
+ type: typeof SHOW_TAP_TO_VIEW_NOT_AVAILABLE_MODAL;
+ payload: TapToViewNotAvailablePropsType;
+}>;
+
type HideContactModalActionType = ReadonlyDeep<{
type: typeof HIDE_CONTACT_MODAL;
}>;
@@ -426,6 +441,7 @@ export type GlobalModalsActionType = ReadonlyDeep<
| HideContactModalActionType
| HideSendAnywayDialogActiontype
| HideStoriesSettingsActionType
+ | HideTapToViewNotAvailableModalActionType
| HideUserNotFoundModalActionType
| HideWhatsNewModalActionType
| MessageChangedActionType
@@ -436,12 +452,11 @@ export type GlobalModalsActionType = ReadonlyDeep<
| ShowEditHistoryModalActionType
| ShowErrorModalActionType
| ShowMediaPermissionsModalActionType
- | ToggleEditNicknameAndNoteModalActionType
- | ToggleMessageRequestActionsConfirmationActionType
| ShowSendAnywayDialogActionType
| ShowShortcutGuideModalActionType
| ShowStickerPackPreviewActionType
| ShowStoriesSettingsActionType
+ | ShowTapToViewNotAvailableModalActionType
| ShowUserNotFoundModalActionType
| ShowWhatsNewModalActionType
| StartMigrationToGV2ActionType
@@ -453,7 +468,9 @@ export type GlobalModalsActionType = ReadonlyDeep<
| ToggleConfirmationModalActionType
| ToggleConfirmLeaveCallModalActionType
| ToggleDeleteMessagesModalActionType
+ | ToggleEditNicknameAndNoteModalActionType
| ToggleForwardMessagesModalActionType
+ | ToggleMessageRequestActionsConfirmationActionType
| ToggleNotePreviewModalActionType
| ToggleProfileEditorActionType
| ToggleProfileEditorErrorActionType
@@ -471,10 +488,12 @@ export const actions = {
closeShortcutGuideModal,
closeStickerPackPreview,
closeMediaPermissionsModal,
+ ensureSystemMediaPermissions,
hideAttachmentNotAvailableModal,
hideBlockingSafetyNumberChangeDialog,
hideContactModal,
hideStoriesSettings,
+ hideTapToViewNotAvailableModal,
hideUserNotFoundModal,
hideWhatsNewModal,
showAttachmentNotAvailableModal,
@@ -482,14 +501,12 @@ export const actions = {
showContactModal,
showEditHistoryModal,
showErrorModal,
- ensureSystemMediaPermissions,
- toggleEditNicknameAndNoteModal,
- toggleMessageRequestActionsConfirmation,
showGV2MigrationDialog,
showShareCallLinkViaSignal,
showShortcutGuideModal,
showStickerPackPreview,
showStoriesSettings,
+ showTapToViewNotAvailableModal,
showUserNotFoundModal,
showWhatsNewModal,
toggleAboutContactModal,
@@ -500,7 +517,9 @@ export const actions = {
toggleConfirmationModal,
toggleConfirmLeaveCallModal,
toggleDeleteMessagesModal,
+ toggleEditNicknameAndNoteModal,
toggleForwardMessagesModal,
+ toggleMessageRequestActionsConfirmation,
toggleNotePreviewModal,
toggleProfileEditor,
toggleProfileEditorHasError,
@@ -528,6 +547,21 @@ function showAttachmentNotAvailableModal(
};
}
+function hideTapToViewNotAvailableModal(): HideTapToViewNotAvailableModalActionType {
+ return {
+ type: HIDE_TAP_TO_VIEW_NOT_AVAILABLE_MODAL,
+ };
+}
+
+function showTapToViewNotAvailableModal(
+ payload: TapToViewNotAvailablePropsType
+): ShowTapToViewNotAvailableModalActionType {
+ return {
+ type: SHOW_TAP_TO_VIEW_NOT_AVAILABLE_MODAL,
+ payload,
+ };
+}
+
function hideContactModal(): HideContactModalActionType {
return {
type: HIDE_CONTACT_MODAL,
@@ -1144,6 +1178,7 @@ export function getEmptyState(): GlobalModalsStateType {
profileEditorHasError: false,
profileEditorInitialEditState: undefined,
messageRequestActionsConfirmationProps: null,
+ tapToViewNotAvailableModalProps: undefined,
notePreviewModalProps: null,
};
}
@@ -1232,6 +1267,20 @@ export function reducer(
};
}
+ if (action.type === HIDE_TAP_TO_VIEW_NOT_AVAILABLE_MODAL) {
+ return {
+ ...state,
+ tapToViewNotAvailableModalProps: undefined,
+ };
+ }
+
+ if (action.type === SHOW_TAP_TO_VIEW_NOT_AVAILABLE_MODAL) {
+ return {
+ ...state,
+ tapToViewNotAvailableModalProps: action.payload,
+ };
+ }
+
if (action.type === SHOW_CONTACT_MODAL) {
const ourId = window.ConversationController.getOurConversationIdOrThrow();
if (action.payload.contactId === ourId) {
diff --git a/ts/state/ducks/lightbox.ts b/ts/state/ducks/lightbox.ts
index d992b459eb..658a802c50 100644
--- a/ts/state/ducks/lightbox.ts
+++ b/ts/state/ducks/lightbox.ts
@@ -285,8 +285,9 @@ function showLightbox(opts: {
if (isIncremental(attachment)) {
// Queue all attachments, but this target attachment should be IMMEDIATE
const wasUpdated = await queueAttachmentDownloads(message, {
- urgency: AttachmentDownloadUrgency.STANDARD,
attachmentDigestForImmediate: attachment.digest,
+ isManualDownload: true,
+ urgency: AttachmentDownloadUrgency.STANDARD,
});
if (wasUpdated) {
await window.MessageCache.saveMessage(message);
diff --git a/ts/state/ducks/stories.ts b/ts/state/ducks/stories.ts
index f1506f07f2..b3608ca287 100644
--- a/ts/state/ducks/stories.ts
+++ b/ts/state/ducks/stories.ts
@@ -529,7 +529,9 @@ function queueStoryDownload(
payload: storyId,
});
- const wasUpdated = await queueAttachmentDownloads(message);
+ const wasUpdated = await queueAttachmentDownloads(message, {
+ isManualDownload: true,
+ });
if (wasUpdated) {
await window.MessageCache.saveMessage(message);
}
diff --git a/ts/state/selectors/message.ts b/ts/state/selectors/message.ts
index 9570ea7e57..da935c1572 100644
--- a/ts/state/selectors/message.ts
+++ b/ts/state/selectors/message.ts
@@ -351,6 +351,7 @@ const getAuthorForMessage = (
avatarUrl,
badges,
color,
+ firstName,
id,
isMe,
name,
@@ -366,6 +367,7 @@ const getAuthorForMessage = (
avatarUrl,
badges,
color,
+ firstName,
id,
isMe,
name,
@@ -772,7 +774,8 @@ export const getPropsForMessage = (
isTapToView: isMessageTapToView,
isTapToViewError:
isMessageTapToView && isIncoming(message) && message.isTapToViewInvalid,
- isTapToViewExpired: isMessageTapToView && message.isErased,
+ isTapToViewExpired:
+ isMessageTapToView && isIncoming(message) && message.isErased,
readStatus: message.readStatus ?? ReadStatus.Read,
selectedReaction,
status: getMessagePropStatus(message, ourConversationId),
diff --git a/ts/state/smart/ContactDetail.tsx b/ts/state/smart/ContactDetail.tsx
new file mode 100644
index 0000000000..6ec915ca2b
--- /dev/null
+++ b/ts/state/smart/ContactDetail.tsx
@@ -0,0 +1,73 @@
+// Copyright 2021 Signal Messenger, LLC
+// SPDX-License-Identifier: AGPL-3.0-only
+
+import React, { memo, useEffect } from 'react';
+import { useSelector } from 'react-redux';
+
+import type { Props as ContactDetailProps } from '../../components/conversation/ContactDetail';
+import { ContactDetail } from '../../components/conversation/ContactDetail';
+import { useConversationsActions } from '../ducks/conversations';
+import { getMessages } from '../selectors/conversations';
+import { getIntl, getRegionCode } from '../selectors/user';
+import { embeddedContactSelector } from '../../types/EmbeddedContact';
+import { getAccountSelector } from '../selectors/accounts';
+
+export type OwnProps = Pick;
+
+export const SmartContactDetail = memo(function SmartContactDetail({
+ messageId,
+}: OwnProps): JSX.Element | null {
+ const i18n = useSelector(getIntl);
+ const regionCode = useSelector(getRegionCode);
+ const messageLookup = useSelector(getMessages);
+ const accountSelector = useSelector(getAccountSelector);
+ const {
+ cancelAttachmentDownload,
+ kickOffAttachmentDownload,
+ popPanelForConversation,
+ startConversation,
+ } = useConversationsActions();
+
+ const contact = messageLookup[messageId]?.contact?.[0];
+
+ useEffect(() => {
+ if (!contact) {
+ popPanelForConversation();
+ }
+ }, [contact, popPanelForConversation]);
+
+ if (!contact) {
+ return null;
+ }
+
+ const numbers = contact?.number;
+ const firstNumber = numbers && numbers[0] ? numbers[0].value : undefined;
+ const fixedContact = embeddedContactSelector(contact, {
+ firstNumber,
+ regionCode,
+ serviceId: accountSelector(firstNumber),
+ });
+ const signalAccount =
+ contact.firstNumber && contact.serviceId
+ ? {
+ phoneNumber: contact.firstNumber,
+ serviceId: contact.serviceId,
+ }
+ : undefined;
+
+ return (
+ {
+ if (signalAccount) {
+ startConversation(signalAccount.phoneNumber, signalAccount.serviceId);
+ }
+ }}
+ />
+ );
+});
diff --git a/ts/state/smart/ConversationPanel.tsx b/ts/state/smart/ConversationPanel.tsx
index 9a00392cd2..55f6ea8ae9 100644
--- a/ts/state/smart/ConversationPanel.tsx
+++ b/ts/state/smart/ConversationPanel.tsx
@@ -13,10 +13,10 @@ import React, {
import { useSelector } from 'react-redux';
import type { PanelRenderType } from '../../types/Panels';
import * as log from '../../logging/log';
-import { ContactDetail } from '../../components/conversation/ContactDetail';
import { PanelType } from '../../types/Panels';
import { SmartAllMedia } from './AllMedia';
import { SmartChatColorPicker } from './ChatColorPicker';
+import { SmartContactDetail } from './ContactDetail';
import { SmartConversationDetails } from './ConversationDetails';
import { SmartConversationNotificationsSettings } from './ConversationNotificationsSettings';
import { SmartGV1Members } from './GV1Members';
@@ -315,9 +315,6 @@ function PanelElement({
conversationId,
panel,
}: PanelPropsType): JSX.Element | null {
- const i18n = useSelector(getIntl);
- const { startConversation } = useConversationsActions();
-
if (panel.type === PanelType.AllMedia) {
return ;
}
@@ -327,23 +324,9 @@ function PanelElement({
}
if (panel.type === PanelType.ContactDetails) {
- const { contact, signalAccount } = panel.args;
+ const { messageId } = panel.args;
- return (
- {
- if (signalAccount) {
- startConversation(
- signalAccount.phoneNumber,
- signalAccount.serviceId
- );
- }
- }}
- />
- );
+ return ;
}
if (panel.type === PanelType.ConversationDetails) {
diff --git a/ts/state/smart/GlobalModalContainer.tsx b/ts/state/smart/GlobalModalContainer.tsx
index 8a3dc982e1..7b73ec7f72 100644
--- a/ts/state/smart/GlobalModalContainer.tsx
+++ b/ts/state/smart/GlobalModalContainer.tsx
@@ -138,12 +138,14 @@ export const SmartGlobalModalContainer = memo(
safetyNumberChangedBlockingData,
safetyNumberModalContactId,
stickerPackPreviewId,
+ tapToViewNotAvailableModalProps,
userNotFoundModalState,
} = useSelector(getGlobalModalsState);
const {
closeErrorModal,
closeMediaPermissionsModal,
+ hideTapToViewNotAvailableModal,
hideUserNotFoundModal,
hideWhatsNewModal,
toggleSignalConnectionsModal,
@@ -223,6 +225,7 @@ export const SmartGlobalModalContainer = memo(
hasSafetyNumberChangeModal={hasSafetyNumberChangeModal}
hideUserNotFoundModal={hideUserNotFoundModal}
hideWhatsNewModal={hideWhatsNewModal}
+ hideTapToViewNotAvailableModal={hideTapToViewNotAvailableModal}
i18n={i18n}
isAboutContactModalVisible={aboutContactModalContactId != null}
isProfileEditorVisible={isProfileEditorVisible}
@@ -259,6 +262,7 @@ export const SmartGlobalModalContainer = memo(
safetyNumberChangedBlockingData={safetyNumberChangedBlockingData}
safetyNumberModalContactId={safetyNumberModalContactId}
stickerPackPreviewId={stickerPackPreviewId}
+ tapToViewNotAvailableModalProps={tapToViewNotAvailableModalProps}
theme={theme}
toggleSignalConnectionsModal={toggleSignalConnectionsModal}
userNotFoundModalState={userNotFoundModalState}
diff --git a/ts/state/smart/MessageDetail.tsx b/ts/state/smart/MessageDetail.tsx
index a79c2ef662..41b36ba0b2 100644
--- a/ts/state/smart/MessageDetail.tsx
+++ b/ts/state/smart/MessageDetail.tsx
@@ -63,6 +63,7 @@ export const SmartMessageDetail = memo(
showAttachmentNotAvailableModal,
showContactModal,
showEditHistoryModal,
+ showTapToViewNotAvailableModal,
toggleSafetyNumberModal,
} = useGlobalModalActions();
const { showLightbox, showLightboxForViewOnceMedia } = useLightboxActions();
@@ -123,6 +124,7 @@ export const SmartMessageDetail = memo(
showLightboxForViewOnceMedia={showLightboxForViewOnceMedia}
showMediaNoLongerAvailableToast={showMediaNoLongerAvailableToast}
showSpoiler={showSpoiler}
+ showTapToViewNotAvailableModal={showTapToViewNotAvailableModal}
startConversation={startConversation}
theme={theme}
toggleSafetyNumberModal={toggleSafetyNumberModal}
diff --git a/ts/state/smart/TimelineItem.tsx b/ts/state/smart/TimelineItem.tsx
index a21c9dc56d..6cf8311227 100644
--- a/ts/state/smart/TimelineItem.tsx
+++ b/ts/state/smart/TimelineItem.tsx
@@ -147,6 +147,7 @@ export const SmartTimelineItem = memo(function SmartTimelineItem(
showAttachmentNotAvailableModal,
showContactModal,
showEditHistoryModal,
+ showTapToViewNotAvailableModal,
toggleMessageRequestActionsConfirmation,
toggleDeleteMessagesModal,
toggleEditNicknameAndNoteModal,
@@ -241,6 +242,7 @@ export const SmartTimelineItem = memo(function SmartTimelineItem(
showLightboxForViewOnceMedia={showLightboxForViewOnceMedia}
showMediaNoLongerAvailableToast={showMediaNoLongerAvailableToast}
showSpoiler={showSpoiler}
+ showTapToViewNotAvailableModal={showTapToViewNotAvailableModal}
startConversation={startConversation}
toggleDeleteMessagesModal={toggleDeleteMessagesModal}
toggleForwardMessagesModal={toggleForwardMessagesModal}
diff --git a/ts/test-both/processDataMessage_test.ts b/ts/test-both/processDataMessage_test.ts
index eb298f7b30..88576ce18a 100644
--- a/ts/test-both/processDataMessage_test.ts
+++ b/ts/test-both/processDataMessage_test.ts
@@ -181,7 +181,7 @@ describe('processDataMessage', () => {
assert.strictEqual(out.profileKey, 'Khc3');
});
- it('should process quote', () => {
+ it('should process quote, dropping second attachment', () => {
const out = check({
quote: {
id: Long.fromNumber(1),
@@ -190,7 +190,12 @@ describe('processDataMessage', () => {
attachments: [
{
contentType: 'image/jpeg',
- fileName: 'image.jpg',
+ fileName: 'image1.jpg',
+ thumbnail: UNPROCESSED_ATTACHMENT,
+ },
+ {
+ contentType: 'image/jpeg',
+ fileName: 'image2.jpg',
thumbnail: UNPROCESSED_ATTACHMENT,
},
],
@@ -204,7 +209,7 @@ describe('processDataMessage', () => {
attachments: [
{
contentType: IMAGE_JPEG,
- fileName: 'image.jpg',
+ fileName: 'image1.jpg',
thumbnail: PROCESSED_ATTACHMENT,
},
],
@@ -213,7 +218,7 @@ describe('processDataMessage', () => {
});
});
- it('should process contact', () => {
+ it('should process contact, dropping second contact', () => {
const out = check({
contact: [
{
@@ -234,8 +239,36 @@ describe('processDataMessage', () => {
{
avatar: { avatar: PROCESSED_ATTACHMENT, isProfile: false },
},
+ ]);
+ });
+
+ it('should process preview, dropping second preview', () => {
+ const out = check({
+ preview: [
+ {
+ description:
+ 'Say "hello" to a different messaging experience. An unexpected focus on privacy, combined with all of the features you expect.',
+ image: UNPROCESSED_ATTACHMENT,
+ title: 'Signal Private Messenger #1',
+ url: 'https://signal.org',
+ },
+ {
+ description: 'Say "hello" again',
+ image: UNPROCESSED_ATTACHMENT,
+ title: 'Signal Private Messenger #2',
+ url: 'https://signal.org',
+ },
+ ],
+ });
+
+ assert.deepStrictEqual(out.preview, [
{
- avatar: { avatar: PROCESSED_ATTACHMENT, isProfile: true },
+ date: undefined,
+ description:
+ 'Say "hello" to a different messaging experience. An unexpected focus on privacy, combined with all of the features you expect.',
+ image: PROCESSED_ATTACHMENT,
+ title: 'Signal Private Messenger #1',
+ url: 'https://signal.org',
},
]);
});
diff --git a/ts/test-electron/services/AttachmentDownloadManager_test.ts b/ts/test-electron/services/AttachmentDownloadManager_test.ts
index 00d12f0691..ed2f2deb50 100644
--- a/ts/test-electron/services/AttachmentDownloadManager_test.ts
+++ b/ts/test-electron/services/AttachmentDownloadManager_test.ts
@@ -122,6 +122,7 @@ describe('AttachmentDownloadManager/JobManager', () => {
await downloadManager?.addJob({
urgency,
...job,
+ isManualDownload: Boolean(job.isManualDownload),
});
}
async function addJobs(
@@ -377,7 +378,10 @@ describe('AttachmentDownloadManager/JobManager', () => {
// add the same job again and it should retry ASAP and reset attempts
attempts = getPromisesForAttempts(jobs[0], 5);
- await downloadManager?.addJob(jobs[0]);
+ await downloadManager?.addJob({
+ ...jobs[0],
+ isManualDownload: Boolean(jobs[0].isManualDownload),
+ });
await attempts[0].completed;
assert.strictEqual(runJob.callCount, 4);
diff --git a/ts/test-mock/settings/settings_test.ts b/ts/test-mock/settings/settings_test.ts
index 45f3d74d86..a716f646db 100644
--- a/ts/test-mock/settings/settings_test.ts
+++ b/ts/test-mock/settings/settings_test.ts
@@ -43,7 +43,7 @@ describe('settings', function (this: Mocha.Suite) {
await settingsWindow.getByText('Language').first().waitFor();
await settingsWindow.getByText('Chats').click();
- await settingsWindow.getByText('Sent media quality').waitFor();
+ await settingsWindow.getByText('Spell check text').waitFor();
await settingsWindow.getByText('Calls').click();
await settingsWindow.getByText('Enable incoming calls').waitFor();
@@ -53,5 +53,8 @@ describe('settings', function (this: Mocha.Suite) {
await settingsWindow.getByText('Privacy').click();
await settingsWindow.getByText('Read receipts').waitFor();
+
+ await settingsWindow.getByText('Data usage').click();
+ await settingsWindow.getByText('Sent media quality').waitFor();
});
});
diff --git a/ts/textsecure/Storage.ts b/ts/textsecure/Storage.ts
index 83171d8ca0..b529ed6e1f 100644
--- a/ts/textsecure/Storage.ts
+++ b/ts/textsecure/Storage.ts
@@ -13,6 +13,13 @@ import { DataReader, DataWriter } from '../sql/Client';
import type { SignalProtocolStore } from '../SignalProtocolStore';
import * as log from '../logging/log';
+export const DEFAULT_AUTO_DOWNLOAD_ATTACHMENT = {
+ photos: true,
+ videos: true,
+ audio: true,
+ documents: true,
+};
+
export class Storage implements StorageInterface {
public readonly user: User;
diff --git a/ts/textsecure/processDataMessage.ts b/ts/textsecure/processDataMessage.ts
index 9a493e00ea..e7e2815eba 100644
--- a/ts/textsecure/processDataMessage.ts
+++ b/ts/textsecure/processDataMessage.ts
@@ -151,7 +151,7 @@ export function processQuote(
id: quote.id?.toNumber(),
authorAci: normalizeAci(authorAci, 'Quote.authorAci'),
text: dropNull(quote.text),
- attachments: (quote.attachments ?? []).map(attachment => {
+ attachments: (quote.attachments ?? []).slice(0, 1).map(attachment => {
return {
contentType: attachment.contentType
? stringToMIMEType(attachment.contentType)
@@ -172,7 +172,7 @@ export function processContact(
return undefined;
}
- return contact.map(item => {
+ return contact.slice(0, 1).map(item => {
return {
...item,
avatar: item.avatar
@@ -206,7 +206,7 @@ export function processPreview(
return undefined;
}
- return preview.map(item => {
+ return preview.slice(0, 1).map(item => {
return {
url: dropNull(item.url),
title: dropNull(item.title),
diff --git a/ts/types/AttachmentDownload.ts b/ts/types/AttachmentDownload.ts
index 242f9089ce..1c77e5b37b 100644
--- a/ts/types/AttachmentDownload.ts
+++ b/ts/types/AttachmentDownload.ts
@@ -28,15 +28,16 @@ export type AttachmentDownloadJobTypeType = z.infer<
>;
export type CoreAttachmentDownloadJobType = {
+ attachment: AttachmentType;
+ attachmentType: AttachmentDownloadJobTypeType;
+ ciphertextSize: number;
+ contentType: MIMEType;
+ digest: string;
+ isManualDownload?: boolean;
messageId: string;
receivedAt: number;
sentAt: number;
- attachmentType: AttachmentDownloadJobTypeType;
- attachment: AttachmentType;
- digest: string;
- contentType: MIMEType;
size: number;
- ciphertextSize: number;
source: AttachmentDownloadSource;
};
@@ -44,18 +45,19 @@ export type AttachmentDownloadJobType = CoreAttachmentDownloadJobType &
JobManagerJobType;
export const coreAttachmentDownloadJobSchema = z.object({
- messageId: z.string(),
- receivedAt: z.number(),
- sentAt: z.number(),
- attachmentType: attachmentDownloadTypeSchema,
attachment: z
.object({ size: z.number(), contentType: MIMETypeSchema })
.passthrough(),
- digest: z.string(),
- contentType: MIMETypeSchema,
- size: z.number(),
+ attachmentType: attachmentDownloadTypeSchema,
ciphertextSize: z.number(),
+ contentType: MIMETypeSchema,
+ digest: z.string(),
+ isManualDownload: z.boolean().optional(),
+ messageId: z.string(),
messageIdForLogging: z.string().optional(),
+ receivedAt: z.number(),
+ sentAt: z.number(),
+ size: z.number(),
source: z.nativeEnum(AttachmentDownloadSource),
});
diff --git a/ts/types/Panels.ts b/ts/types/Panels.ts
index b5337d6177..590a139b00 100644
--- a/ts/types/Panels.ts
+++ b/ts/types/Panels.ts
@@ -3,9 +3,7 @@
import type { ReadonlyDeep } from 'type-fest';
-import type { EmbeddedContactType } from './EmbeddedContact';
import type { ReadonlyMessageAttributesType } from '../model-types.d';
-import type { ServiceIdString } from './ServiceId';
export enum PanelType {
AllMedia = 'AllMedia',
@@ -27,11 +25,7 @@ export type PanelRequestType = ReadonlyDeep<
| {
type: PanelType.ContactDetails;
args: {
- contact: EmbeddedContactType;
- signalAccount?: {
- phoneNumber: string;
- serviceId: ServiceIdString;
- };
+ messageId: string;
};
}
| { type: PanelType.ConversationDetails }
@@ -50,11 +44,7 @@ export type PanelRenderType = ReadonlyDeep<
| {
type: PanelType.ContactDetails;
args: {
- contact: EmbeddedContactType;
- signalAccount?: {
- phoneNumber: string;
- serviceId: ServiceIdString;
- };
+ messageId: string;
};
}
| { type: PanelType.ConversationDetails }
diff --git a/ts/types/Storage.d.ts b/ts/types/Storage.d.ts
index db11008f06..356252e5d9 100644
--- a/ts/types/Storage.d.ts
+++ b/ts/types/Storage.d.ts
@@ -22,6 +22,13 @@ import type { ServiceIdString } from './ServiceId';
import type { RegisteredChallengeType } from '../challenge';
+export type AutoDownloadAttachmentType = {
+ photos: boolean;
+ videos: boolean;
+ audio: boolean;
+ documents: boolean;
+};
+
export type SerializedCertificateType = {
expires: number;
serialized: Uint8Array;
@@ -47,6 +54,7 @@ export type StorageAccessType = {
'always-relay-calls': boolean;
'audio-notification': boolean;
'auto-download-update': boolean;
+ 'auto-download-attachment': AutoDownloadAttachmentType;
autoConvertEmoji: boolean;
'badge-count-muted-conversations': boolean;
'blocked-groups': ReadonlyArray;
diff --git a/ts/types/Toast.tsx b/ts/types/Toast.tsx
index 64e294dd10..a83eea7ef0 100644
--- a/ts/types/Toast.tsx
+++ b/ts/types/Toast.tsx
@@ -6,6 +6,7 @@ export enum ToastType {
AddedUsersToCall = 'AddedUsersToCall',
AlreadyGroupMember = 'AlreadyGroupMember',
AlreadyRequestedToJoin = 'AlreadyRequestedToJoin',
+ AttachmentDownloadFailed = 'AttachmentDownloadFailed',
AttachmentDownloadStillInProgress = 'AttachmentDownloadStillInProgress',
Blocked = 'Blocked',
BlockedGroup = 'BlockedGroup',
@@ -82,6 +83,10 @@ export type AnyToast =
}
| { toastType: ToastType.AlreadyGroupMember }
| { toastType: ToastType.AlreadyRequestedToJoin }
+ | {
+ toastType: ToastType.AttachmentDownloadFailed;
+ parameters: { messageId: string };
+ }
| {
toastType: ToastType.AttachmentDownloadStillInProgress;
parameters: { count: number };
diff --git a/ts/util/attachmentDownloadQueue.ts b/ts/util/attachmentDownloadQueue.ts
index 7d191770d1..907c32e3a0 100644
--- a/ts/util/attachmentDownloadQueue.ts
+++ b/ts/util/attachmentDownloadQueue.ts
@@ -90,7 +90,9 @@ export async function flushAttachmentDownloadQueue(): Promise {
// to display the message properly.
hasRequiredAttachmentDownloads(message.attributes)
) {
- const shouldSave = await queueAttachmentDownloadsForMessage(message);
+ const shouldSave = await queueAttachmentDownloadsForMessage(message, {
+ isManualDownload: false,
+ });
if (shouldSave) {
messageIdsToSave.push(messageId);
}
diff --git a/ts/util/createIPCEvents.ts b/ts/util/createIPCEvents.ts
index 2f94ea2df7..dff85eab87 100644
--- a/ts/util/createIPCEvents.ts
+++ b/ts/util/createIPCEvents.ts
@@ -6,7 +6,10 @@ import type { SystemPreferences } from 'electron';
import type { AudioDevice } from '@signalapp/ringrtc';
import { noop } from 'lodash';
-import type { ZoomFactorType } from '../types/Storage.d';
+import type {
+ AutoDownloadAttachmentType,
+ ZoomFactorType,
+} from '../types/Storage.d';
import type {
ConversationColorType,
CustomColorType,
@@ -55,6 +58,7 @@ import type { SystemTraySetting } from '../types/SystemTraySetting';
import { drop } from './drop';
import { sendSyncRequests } from '../textsecure/syncRequests';
import { waitForEvent } from '../shims/events';
+import { DEFAULT_AUTO_DOWNLOAD_ATTACHMENT } from '../textsecure/Storage';
type SentMediaQualityType = 'standard' | 'high';
type NotificationSettingType = 'message' | 'name' | 'count' | 'off';
@@ -64,6 +68,7 @@ export type IPCEventsValuesType = {
audioNotification: boolean | undefined;
audioMessage: boolean;
autoConvertEmoji: boolean;
+ autoDownloadAttachment: AutoDownloadAttachmentType;
autoDownloadUpdate: boolean;
autoLaunch: boolean;
callRingtoneNotification: boolean;
@@ -408,6 +413,13 @@ export function createIPCEvents(
window.storage.get('typingIndicators', false),
// Configurable settings
+ getAutoDownloadAttachment: () =>
+ window.storage.get(
+ 'auto-download-attachment',
+ DEFAULT_AUTO_DOWNLOAD_ATTACHMENT
+ ),
+ setAutoDownloadAttachment: (setting: AutoDownloadAttachmentType) =>
+ window.storage.put('auto-download-attachment', setting),
getAutoDownloadUpdate: () =>
window.storage.get('auto-download-update', true),
setAutoDownloadUpdate: value =>
diff --git a/ts/util/handleEditMessage.ts b/ts/util/handleEditMessage.ts
index 4019194a0b..8608ba29e0 100644
--- a/ts/util/handleEditMessage.ts
+++ b/ts/util/handleEditMessage.ts
@@ -289,7 +289,9 @@ export async function handleEditMessage(
});
// Queue up any downloads in case they're different, update the fields if so.
- const wasUpdated = await queueAttachmentDownloads(mainMessageModel);
+ const wasUpdated = await queueAttachmentDownloads(mainMessageModel, {
+ isManualDownload: false,
+ });
// If we've scheduled a bodyAttachment download, we need that edit to know about it
if (wasUpdated && mainMessageModel.get('bodyAttachment')) {
diff --git a/ts/util/lint/exceptions.json b/ts/util/lint/exceptions.json
index 4d73b076ec..cf5c9bba95 100644
--- a/ts/util/lint/exceptions.json
+++ b/ts/util/lint/exceptions.json
@@ -1785,6 +1785,13 @@
"reasonCategory": "usageTrusted",
"updated": "2023-08-10T00:23:35.320Z"
},
+ {
+ "rule": "React-useRef",
+ "path": "ts/components/conversation/AttachmentStatusIcon.tsx",
+ "line": " const timerRef = useRef();",
+ "reasonCategory": "usageTrusted",
+ "updated": "2025-02-21T04:17:59.239Z"
+ },
{
"rule": "React-useRef",
"path": "ts/components/conversation/CallingNotification.tsx",
diff --git a/ts/util/queueAttachmentDownloads.ts b/ts/util/queueAttachmentDownloads.ts
index df2011434f..27d3fe107e 100644
--- a/ts/util/queueAttachmentDownloads.ts
+++ b/ts/util/queueAttachmentDownloads.ts
@@ -2,7 +2,7 @@
// SPDX-License-Identifier: AGPL-3.0-only
import * as defaultLogger from '../logging/log';
-import { isLongMessage } from '../types/MIME';
+import { isAudio, isImage, isLongMessage, isVideo } from '../types/MIME';
import { getMessageIdForLogging } from './idForLogging';
import {
copyStickerToAttachments,
@@ -23,6 +23,7 @@ import {
getAttachmentSignatureSafe,
isDownloading,
isDownloaded,
+ isVoiceMessage,
partitionBodyAndNormalAttachments,
} from '../types/Attachment';
import type { StickerType } from '../types/Stickers';
@@ -44,6 +45,7 @@ import {
} from './attachmentDownloadQueue';
import { queueUpdateMessage } from './messageBatcher';
import type { LoggerType } from '../types/Logging';
+import { DEFAULT_AUTO_DOWNLOAD_ATTACHMENT } from '../textsecure/Storage';
export type MessageAttachmentsDownloadedType = {
bodyAttachment?: AttachmentType;
@@ -84,18 +86,21 @@ export async function handleAttachmentDownloadsForNewMessage(
if (shouldUseAttachmentDownloadQueue()) {
addToAttachmentDownloadQueue(logId, message);
} else {
- await queueAttachmentDownloadsForMessage(message);
+ await queueAttachmentDownloadsForMessage(message, {
+ isManualDownload: false,
+ });
}
}
}
export async function queueAttachmentDownloadsForMessage(
message: MessageModel,
- urgency?: AttachmentDownloadUrgency
+ options: {
+ urgency?: AttachmentDownloadUrgency;
+ isManualDownload: boolean;
+ }
): Promise {
- const updated = await queueAttachmentDownloads(message, {
- urgency,
- });
+ const updated = await queueAttachmentDownloads(message, options);
if (!updated) {
return false;
}
@@ -111,15 +116,22 @@ export async function queueAttachmentDownloadsForMessage(
export async function queueAttachmentDownloads(
message: MessageModel,
{
- urgency = AttachmentDownloadUrgency.STANDARD,
- source = AttachmentDownloadSource.STANDARD,
attachmentDigestForImmediate,
+ isManualDownload,
+ source = AttachmentDownloadSource.STANDARD,
+ urgency = AttachmentDownloadUrgency.STANDARD,
}: {
- urgency?: AttachmentDownloadUrgency;
- source?: AttachmentDownloadSource;
attachmentDigestForImmediate?: string;
- } = {}
+ isManualDownload: boolean;
+ source?: AttachmentDownloadSource;
+ urgency?: AttachmentDownloadUrgency;
+ }
): Promise {
+ const autoDownloadAttachment = window.storage.get(
+ 'auto-download-attachment',
+ DEFAULT_AUTO_DOWNLOAD_ATTACHMENT
+ );
+
const messageId = message.id;
const idForLogging = getMessageIdForLogging(message.attributes);
@@ -153,50 +165,51 @@ export async function queueAttachmentDownloads(
bodyAttachmentsToDownload.map(attachment =>
AttachmentDownloadManager.addJob({
attachment,
- messageId,
attachmentType: 'long-message',
+ isManualDownload,
+ messageId,
receivedAt: message.get('received_at'),
sentAt: message.get('sent_at'),
- urgency,
source,
+ urgency,
})
)
);
count += bodyAttachmentsToDownload.length;
}
+ const startingAttachments = message.get('attachments') || [];
const { attachments, count: attachmentsCount } = await queueNormalAttachments(
{
+ attachmentDigestForImmediate,
+ attachments: startingAttachments,
+ isManualDownload,
logId,
messageId,
- attachments: message.get('attachments'),
otherAttachments: message
.get('editHistory')
?.flatMap(x => x.attachments ?? []),
receivedAt: message.get('received_at'),
sentAt: message.get('sent_at'),
- urgency,
source,
- attachmentDigestForImmediate,
+ urgency,
}
);
if (attachmentsCount > 0) {
message.set({ attachments });
+ }
+ if (startingAttachments.length > 0) {
log.info(
- `${logId}: Queueing ${attachmentsCount} normal attachment downloads`
+ `${logId}: Queued ${attachmentsCount} (of ${startingAttachments.length}) normal attachment downloads`
);
}
count += attachmentsCount;
const previewsToQueue = message.get('preview') || [];
- if (previewsToQueue.length > 0) {
- log.info(
- `${logId}: Queueing ${previewsToQueue.length} preview attachment downloads`
- );
- }
const { preview, count: previewCount } = await queuePreviews({
logId,
+ isManualDownload,
messageId,
previews: previewsToQueue,
otherPreviews: message.get('editHistory')?.flatMap(x => x.preview ?? []),
@@ -208,40 +221,41 @@ export async function queueAttachmentDownloads(
if (previewCount > 0) {
message.set({ preview });
}
+ if (previewsToQueue.length > 0) {
+ log.info(
+ `${logId}: Queued ${previewCount} (of ${previewsToQueue.length}) preview attachment downloads`
+ );
+ }
count += previewCount;
const numQuoteAttachments = message.get('quote')?.attachments?.length ?? 0;
- if (numQuoteAttachments > 0) {
- log.info(
- `${logId}: Queueing ${numQuoteAttachments} ` +
- 'quote attachment downloads'
- );
- }
const { quote, count: thumbnailCount } = await queueQuoteAttachments({
logId,
+ isManualDownload,
messageId,
- quote: message.get('quote'),
otherQuotes:
message
.get('editHistory')
?.map(x => x.quote)
.filter(isNotNil) ?? [],
+ quote: message.get('quote'),
receivedAt: message.get('received_at'),
sentAt: message.get('sent_at'),
- urgency,
source,
+ urgency,
});
if (thumbnailCount > 0) {
message.set({ quote });
}
+ if (numQuoteAttachments > 0) {
+ log.info(
+ `${logId}: Queued ${thumbnailCount} (of ${numQuoteAttachments}) quote attachment downloads`
+ );
+ }
count += thumbnailCount;
const contactsToQueue = message.get('contact') || [];
- if (contactsToQueue.length > 0) {
- log.info(
- `${logId}: Queueing ${contactsToQueue.length} contact attachment downloads`
- );
- }
+ let avatarCount = 0;
const contact = await Promise.all(
contactsToQueue.map(async item => {
if (!item.avatar || !item.avatar.avatar) {
@@ -253,31 +267,47 @@ export async function queueAttachmentDownloads(
return item;
}
- count += 1;
+ if (!isManualDownload) {
+ if (autoDownloadAttachment.photos === false) {
+ return item;
+ }
+ }
+
+ avatarCount += 1;
return {
...item,
avatar: {
...item.avatar,
avatar: await AttachmentDownloadManager.addJob({
attachment: item.avatar.avatar,
- messageId,
attachmentType: 'contact',
+ isManualDownload,
+ messageId,
receivedAt: message.get('received_at'),
sentAt: message.get('sent_at'),
- urgency,
source,
+ urgency,
}),
},
};
})
);
- message.set({ contact });
+ if (avatarCount > 0) {
+ message.set({ contact });
+ }
+ if (contactsToQueue.length > 0) {
+ log.info(
+ `${logId}: Queued ${avatarCount} (of ${contactsToQueue.length}) contact attachment downloads`
+ );
+ }
+ count += avatarCount;
let sticker = message.get('sticker');
+ let copiedSticker = false;
+ let queuedStickerDownload = false;
if (sticker && sticker.data && sticker.data.path) {
log.info(`${logId}: Sticker attachment already downloaded`);
} else if (sticker) {
- log.info(`${logId}: Queueing sticker download`);
count += 1;
const { packId, stickerId, packKey } = sticker;
@@ -286,7 +316,9 @@ export async function queueAttachmentDownloads(
if (status && (status === 'downloaded' || status === 'installed')) {
try {
+ log.info(`${logId}: Copying sticker from installed pack`);
data = await copyStickerToAttachments(packId, stickerId);
+ copiedSticker = true;
} catch (error) {
log.error(
`${logId}: Problem copying sticker (${packId}, ${stickerId}) to attachments:`,
@@ -294,16 +326,20 @@ export async function queueAttachmentDownloads(
);
}
}
+
if (!data) {
if (sticker.data) {
+ log.info(`${logId}: Queueing sticker download`);
+ queuedStickerDownload = true;
data = await AttachmentDownloadManager.addJob({
attachment: sticker.data,
- messageId,
attachmentType: 'sticker',
+ isManualDownload,
+ messageId,
receivedAt: message.get('received_at'),
sentAt: message.get('sent_at'),
- urgency,
source,
+ urgency,
});
} else {
log.error(`${logId}: Sticker data was missing`);
@@ -317,7 +353,7 @@ export async function queueAttachmentDownloads(
};
if (!status) {
// Save the packId/packKey for future download/install
- void savePackMetadata(packId, packKey, stickerRef);
+ await savePackMetadata(packId, packKey, stickerRef);
} else {
await DataWriter.addStickerPackReference(stickerRef);
}
@@ -328,39 +364,45 @@ export async function queueAttachmentDownloads(
sticker = {
...sticker,
- packId,
data,
};
}
- message.set({ sticker });
+ if (queuedStickerDownload || copiedSticker) {
+ message.set({ sticker });
+ }
let editHistory = message.get('editHistory');
+
+ let allEditsAttachmentCount = 0;
if (editHistory) {
log.info(`${logId}: Looping through ${editHistory.length} edits`);
editHistory = await Promise.all(
editHistory.map(async edit => {
const { attachments: editAttachments, count: editAttachmentsCount } =
await queueNormalAttachments({
+ attachments: edit.attachments,
+ isManualDownload,
logId,
messageId,
- attachments: edit.attachments,
otherAttachments: attachments,
receivedAt: message.get('received_at'),
sentAt: message.get('sent_at'),
- urgency,
source,
+ urgency,
});
count += editAttachmentsCount;
- if (editAttachmentsCount !== 0) {
+ allEditsAttachmentCount += editAttachmentsCount;
+ if (editAttachments.length !== 0) {
log.info(
- `${logId}: Queueing ${editAttachmentsCount} normal attachment ` +
- `downloads (edited:${edit.timestamp})`
+ `${logId}: Queued ${editAttachmentsCount} (of ${edit.attachments?.length ?? 0}) ` +
+ `normal attachment downloads (edited:${edit.timestamp})`
);
}
const { preview: editPreview, count: editPreviewCount } =
await queuePreviews({
logId,
+ isManualDownload,
messageId,
previews: edit.preview,
otherPreviews: preview,
@@ -370,10 +412,11 @@ export async function queueAttachmentDownloads(
source,
});
count += editPreviewCount;
- if (editPreviewCount !== 0) {
+ allEditsAttachmentCount += editPreviewCount;
+ if (editPreview.length !== 0) {
log.info(
- `${logId}: Queueing ${editPreviewCount} preview attachment ` +
- `downloads (edited:${edit.timestamp})`
+ `${logId}: Queued ${editPreviewCount} (of ${edit.preview?.length ?? 0}) ` +
+ `preview attachment downloads (edited:${edit.timestamp})`
);
}
@@ -385,7 +428,9 @@ export async function queueAttachmentDownloads(
})
);
}
- message.set({ editHistory });
+ if (allEditsAttachmentCount > 0) {
+ message.set({ editHistory });
+ }
if (count <= 0) {
return false;
@@ -397,25 +442,27 @@ export async function queueAttachmentDownloads(
}
export async function queueNormalAttachments({
+ attachmentDigestForImmediate,
+ attachments = [],
+ isManualDownload,
logId,
messageId,
- attachments = [],
otherAttachments,
receivedAt,
sentAt,
- urgency,
source,
- attachmentDigestForImmediate,
+ urgency,
}: {
+ attachmentDigestForImmediate?: string;
+ attachments: MessageAttributesType['attachments'];
+ isManualDownload: boolean;
logId: string;
messageId: string;
- attachments: MessageAttributesType['attachments'];
otherAttachments: MessageAttributesType['attachments'];
receivedAt: number;
sentAt: number;
- urgency: AttachmentDownloadUrgency;
source: AttachmentDownloadSource;
- attachmentDigestForImmediate?: string;
+ urgency: AttachmentDownloadUrgency;
}): Promise<{
attachments: Array;
count: number;
@@ -472,6 +519,33 @@ export async function queueNormalAttachments({
return existingAttachment;
}
+ const { contentType } = attachment;
+ if (!isManualDownload) {
+ const autoDownloadAttachment = window.storage.get(
+ 'auto-download-attachment',
+ DEFAULT_AUTO_DOWNLOAD_ATTACHMENT
+ );
+
+ if (isVideo(contentType)) {
+ if (autoDownloadAttachment.videos === false) {
+ return attachment;
+ }
+ } else if (isImage(contentType)) {
+ if (autoDownloadAttachment.photos === false) {
+ return attachment;
+ }
+ } else if (isAudio(contentType)) {
+ if (
+ autoDownloadAttachment.audio === false &&
+ !isVoiceMessage(attachment)
+ ) {
+ return attachment;
+ }
+ } else if (autoDownloadAttachment.documents === false) {
+ return attachment;
+ }
+ }
+
count += 1;
const urgencyForAttachment =
@@ -481,12 +555,13 @@ export async function queueNormalAttachments({
: urgency;
return AttachmentDownloadManager.addJob({
attachment,
- messageId,
attachmentType: 'attachment',
+ isManualDownload,
+ messageId,
receivedAt,
sentAt,
- urgency: urgencyForAttachment,
source,
+ urgency: urgencyForAttachment,
});
})
);
@@ -513,23 +588,25 @@ function getLinkPreviewSignature(preview: LinkPreviewType): string | undefined {
}
async function queuePreviews({
+ isManualDownload,
logId,
messageId,
- previews = [],
otherPreviews,
+ previews = [],
receivedAt,
sentAt,
- urgency,
source,
+ urgency,
}: {
+ isManualDownload: boolean;
logId: string;
messageId: string;
- previews: MessageAttributesType['preview'];
otherPreviews: MessageAttributesType['preview'];
+ previews: MessageAttributesType['preview'];
receivedAt: number;
sentAt: number;
- urgency: AttachmentDownloadUrgency;
source: AttachmentDownloadSource;
+ urgency: AttachmentDownloadUrgency;
}): Promise<{ preview: Array; count: number }> {
const log = getLogger(source);
// Similar to queueNormalAttachments' logic for detecting same attachments
@@ -572,17 +649,29 @@ async function queuePreviews({
return existingPreview;
}
+ if (!isManualDownload) {
+ const autoDownloadAttachment = window.storage.get(
+ 'auto-download-attachment',
+ DEFAULT_AUTO_DOWNLOAD_ATTACHMENT
+ );
+
+ if (autoDownloadAttachment.photos === false) {
+ return item;
+ }
+ }
+
count += 1;
return {
...item,
image: await AttachmentDownloadManager.addJob({
attachment: item.image,
- messageId,
attachmentType: 'preview',
+ isManualDownload,
+ messageId,
receivedAt,
sentAt,
- urgency,
source,
+ urgency,
}),
};
})
@@ -609,23 +698,25 @@ function getQuoteThumbnailSignature(
}
async function queueQuoteAttachments({
+ isManualDownload,
logId,
messageId,
- quote,
otherQuotes,
+ quote,
receivedAt,
sentAt,
- urgency,
source,
+ urgency,
}: {
logId: string;
+ isManualDownload: boolean;
messageId: string;
- quote: QuotedMessageType | undefined;
otherQuotes: ReadonlyArray;
+ quote: QuotedMessageType | undefined;
receivedAt: number;
sentAt: number;
- urgency: AttachmentDownloadUrgency;
source: AttachmentDownloadSource;
+ urgency: AttachmentDownloadUrgency;
}): Promise<{ quote?: QuotedMessageType; count: number }> {
const log = getLogger(source);
let count = 0;
@@ -691,17 +782,20 @@ async function queueQuoteAttachments({
};
}
+ // Note: we always download quote attachments
+
count += 1;
return {
...item,
thumbnail: await AttachmentDownloadManager.addJob({
attachment: item.thumbnail,
- messageId,
attachmentType: 'quote',
+ isManualDownload,
+ messageId,
receivedAt,
sentAt,
- urgency,
source,
+ urgency,
}),
};
})
diff --git a/ts/windows/preload.ts b/ts/windows/preload.ts
index 507e8688c1..797cff2b2b 100644
--- a/ts/windows/preload.ts
+++ b/ts/windows/preload.ts
@@ -42,6 +42,7 @@ installSetting('audioMessage');
installSetting('audioNotification');
installSetting('autoConvertEmoji');
installSetting('autoDownloadUpdate');
+installSetting('autoDownloadAttachment');
installSetting('autoLaunch');
installSetting('callRingtoneNotification');
installSetting('callSystemNotification');
diff --git a/ts/windows/settings/app.tsx b/ts/windows/settings/app.tsx
index 472dae0a07..385b937ff4 100644
--- a/ts/windows/settings/app.tsx
+++ b/ts/windows/settings/app.tsx
@@ -25,6 +25,7 @@ setEnvironment(
SettingsWindowProps.onRender(
({
addCustomColor,
+ autoDownloadAttachment,
availableCameras,
availableLocales,
availableMicrophones,
@@ -75,6 +76,7 @@ SettingsWindowProps.onRender(
notificationContent,
onAudioNotificationsChange,
onAutoConvertEmojiChange,
+ onAutoDownloadAttachmentChange,
onAutoDownloadUpdateChange,
onAutoLaunchChange,
onCallNotificationsChange,
@@ -126,6 +128,7 @@ SettingsWindowProps.onRender(
ReactDOM.render(
(f: (value: Value) => Promise) {
async function renderPreferences() {
const {
+ autoDownloadAttachment,
blockedCount,
deviceName,
hasAudioNotifications,
@@ -181,6 +183,7 @@ async function renderPreferences() {
defaultConversationColor,
isSyncNotSupported,
} = await awaitObject({
+ autoDownloadAttachment: settingAutoDownloadAttachment.getValue(),
blockedCount: settingBlockedCount.getValue(),
deviceName: settingDeviceName.getValue(),
hasAudioNotifications: settingAudioNotification.getValue(),
@@ -266,6 +269,7 @@ async function renderPreferences() {
const props = {
// Settings
+ autoDownloadAttachment,
availableCameras,
availableLocales,
availableMicrophones,
@@ -352,6 +356,9 @@ async function renderPreferences() {
onAutoDownloadUpdateChange: attachRenderCallback(
settingAutoDownloadUpdate.setValue
),
+ onAutoDownloadAttachmentChange: attachRenderCallback(
+ settingAutoDownloadAttachment.setValue
+ ),
onAutoLaunchChange: attachRenderCallback(settingAutoLaunch.setValue),
onCallNotificationsChange: attachRenderCallback(
settingCallSystemNotification.setValue