diff --git a/ts/components/ConfirmationDialog.md b/ts/components/ConfirmationDialog.md
deleted file mode 100644
index 328ce1027831..000000000000
--- a/ts/components/ConfirmationDialog.md
+++ /dev/null
@@ -1,16 +0,0 @@
-#### All Options
-
-```jsx
-
- console.log('onClose')}
- onAffirmative={() => console.log('onAffirmative')}
- affirmativeText="Affirm"
- onNegative={() => console.log('onNegative')}
- negativeText="Negate"
- >
- asdf child
-
-
-```
diff --git a/ts/components/ConfirmationDialog.stories.tsx b/ts/components/ConfirmationDialog.stories.tsx
new file mode 100644
index 000000000000..e5f64537b087
--- /dev/null
+++ b/ts/components/ConfirmationDialog.stories.tsx
@@ -0,0 +1,40 @@
+import * as React from 'react';
+import { ConfirmationDialog } from './ConfirmationDialog';
+
+// @ts-ignore
+import { setup as setupI18n } from '../../js/modules/i18n';
+// @ts-ignore
+import enMessages from '../../_locales/en/messages.json';
+
+import { storiesOf } from '@storybook/react';
+import { action } from '@storybook/addon-actions';
+import { text } from '@storybook/addon-knobs';
+
+const i18n = setupI18n('en', enMessages);
+
+storiesOf('Components/ConfirmationDialog', module).add(
+ 'ConfirmationDialog',
+ () => {
+ return (
+
+ {text('Child text', 'asdf blip')}
+
+ );
+ }
+);
diff --git a/ts/components/ConfirmationDialog.tsx b/ts/components/ConfirmationDialog.tsx
index 98ab848da75e..bb836b4b450c 100644
--- a/ts/components/ConfirmationDialog.tsx
+++ b/ts/components/ConfirmationDialog.tsx
@@ -2,14 +2,18 @@ import * as React from 'react';
import classNames from 'classnames';
import { LocalizerType } from '../types/Util';
+export type ActionSpec = {
+ text: string;
+ action: () => unknown;
+ style?: 'affirmative' | 'negative';
+};
+
export type OwnProps = {
readonly i18n: LocalizerType;
readonly children: React.ReactNode;
- readonly affirmativeText?: string;
- readonly onAffirmative?: () => unknown;
+ readonly title?: string | React.ReactNode;
+ readonly actions: Array;
readonly onClose: () => unknown;
- readonly negativeText?: string;
- readonly onNegative?: () => unknown;
};
export type Props = OwnProps;
@@ -21,15 +25,7 @@ function focusRef(el: HTMLElement | null) {
}
export const ConfirmationDialog = React.memo(
- ({
- i18n,
- onClose,
- children,
- onAffirmative,
- onNegative,
- affirmativeText,
- negativeText,
- }: Props) => {
+ ({ i18n, onClose, children, title, actions }: Props) => {
React.useEffect(() => {
const handler = ({ key }: KeyboardEvent) => {
if (key === 'Escape') {
@@ -52,22 +48,25 @@ export const ConfirmationDialog = React.memo(
[onClose]
);
- const handleNegative = React.useCallback(() => {
- onClose();
- if (onNegative) {
- onNegative();
- }
- }, [onClose, onNegative]);
-
- const handleAffirmative = React.useCallback(() => {
- onClose();
- if (onAffirmative) {
- onAffirmative();
- }
- }, [onClose, onAffirmative]);
+ const handleAction = React.useCallback(
+ (e: React.MouseEvent) => {
+ onClose();
+ if (e.currentTarget.dataset.action) {
+ const actionIndex = parseInt(e.currentTarget.dataset.action, 10);
+ const { action } = actions[actionIndex];
+ action();
+ }
+ },
+ [onClose, actions]
+ );
return (
);
diff --git a/ts/components/ConfirmationModal.tsx b/ts/components/ConfirmationModal.tsx
index b4d64714845b..748dd6b8f266 100644
--- a/ts/components/ConfirmationModal.tsx
+++ b/ts/components/ConfirmationModal.tsx
@@ -1,31 +1,21 @@
import * as React from 'react';
import { createPortal } from 'react-dom';
-import { ConfirmationDialog } from './ConfirmationDialog';
+import {
+ ConfirmationDialog,
+ Props as ConfirmationDialogProps,
+} from './ConfirmationDialog';
import { LocalizerType } from '../types/Util';
export type OwnProps = {
readonly i18n: LocalizerType;
- readonly children: React.ReactNode;
- readonly affirmativeText?: string;
- readonly onAffirmative?: () => unknown;
readonly onClose: () => unknown;
- readonly negativeText?: string;
- readonly onNegative?: () => unknown;
};
-export type Props = OwnProps;
+export type Props = OwnProps & ConfirmationDialogProps;
export const ConfirmationModal = React.memo(
// tslint:disable-next-line max-func-body-length
- ({
- i18n,
- onClose,
- children,
- onAffirmative,
- onNegative,
- affirmativeText,
- negativeText,
- }: Props) => {
+ ({ i18n, onClose, children, ...rest }: Props) => {
const [root, setRoot] = React.useState
+ {title ? (
+
+ {title} +
+ ) : null}
{children}
@@ -79,28 +78,24 @@ export const ConfirmationDialog = React.memo(
>
{i18n('confirmation-dialog--Cancel')}
- {onNegative && negativeText ? (
+ {actions.map((action, i) => (
- ) : null}
- {onAffirmative && affirmativeText ? (
-
- ) : null}
+ ))}
+
+ );
+ })
+ .add('Direct (Two Other Groups)', () => {
+ return (
+
+
+ );
+ })
+ .add('Direct (One Other Group)', () => {
+ return (
+
+
+ );
+ })
+ .add('Direct (No Other Groups)', () => {
+ return (
+
+
+ );
+ })
+ .add('Group (many members)', () => {
+ return (
+
+
+ );
+ })
+ .add('Group (one member)', () => {
+ return (
+
+
+ );
+ })
+ .add('Group (zero members)', () => {
+ return (
+
+
+ );
+ })
+ .add('Note to Self', () => {
+ return (
+
+
+ );
+ });
diff --git a/ts/components/conversation/ConversationHero.tsx b/ts/components/conversation/ConversationHero.tsx
new file mode 100644
index 000000000000..07fabeb46727
--- /dev/null
+++ b/ts/components/conversation/ConversationHero.tsx
@@ -0,0 +1,125 @@
+import * as React from 'react';
+import { take } from 'lodash';
+import { Avatar, Props as AvatarProps } from '../Avatar';
+import { ContactName } from './ContactName';
+import { Emojify } from './Emojify';
+import { Intl } from '../Intl';
+import { LocalizerType } from '../../types/Util';
+
+export type Props = {
+ i18n: LocalizerType;
+ isMe?: boolean;
+ groups?: Array{i18n('noteToSelfHero')}
;
+ }
+
+ if (conversationType === 'direct' && groups && groups.length > 0) {
+ const firstThreeGroups = take(groups, 3).map((group, i) => (
+
+
+
+ );
+ }
+
+ return null;
+};
+
+export const ConversationHero = ({
+ i18n,
+ avatarPath,
+ color,
+ conversationType,
+ isMe,
+ membersCount,
+ groups = [],
+ name,
+ phoneNumber,
+ profileName,
+ onHeightChange,
+}: Props) => {
+ const firstRenderRef = React.useRef(true);
+
+ React.useEffect(() => {
+ // If any of the depenencies for this hook change then the height of this
+ // component may have changed. The cleanup function notifies listeners of
+ // any potential height changes.
+ return () => {
+ if (onHeightChange && !firstRenderRef.current) {
+ onHeightChange();
+ } else {
+ firstRenderRef.current = false;
+ }
+ };
+ }, [
+ firstRenderRef,
+ onHeightChange,
+ // Avoid collisions in these dependencies by prefixing them
+ // These dependencies may be dynamic, and therefore may cause height changes
+ `mc-${membersCount}`,
+ `n-${name}`,
+ `pn-${profileName}`,
+ ...groups.map(g => `g-${g}`),
+ ]);
+
+ return (
+
+
+ {isMe ? (
+ i18n('noteToSelf')
+ ) : (
+
+ {!isMe ? (
+
+ );
+};
diff --git a/ts/components/conversation/Image.tsx b/ts/components/conversation/Image.tsx
index 86cd36ace1c3..147e4f804e53 100644
--- a/ts/components/conversation/Image.tsx
+++ b/ts/components/conversation/Image.tsx
@@ -1,5 +1,6 @@
import React from 'react';
import classNames from 'classnames';
+import { Blurhash } from 'react-blurhash';
import { Spinner } from '../Spinner';
import { LocalizerType } from '../../types/Util';
@@ -30,6 +31,7 @@ interface Props {
darkOverlay?: boolean;
playIconOverlay?: boolean;
softCorners?: boolean;
+ blurHash?: string;
i18n: LocalizerType;
onClick?: (attachment: AttachmentType) => void;
@@ -38,7 +40,21 @@ interface Props {
}
export class Image extends React.Component
+ {isMe ? (
+ i18n('noteToSelf')
+ ) : (
+
+ {!isMe ? (
+
+ {membersCount === 1
+ ? i18n('ConversationHero--members-1')
+ : membersCount !== undefined
+ ? i18n('ConversationHero--members', [`${membersCount}`])
+ : phoneNumber}
+
+ ) : null}
+ {renderMembershipRow({ isMe, groups, conversationType, i18n })}
+ {
>
- ) : (
+ ) : url ? (
+
+ );
+ })
+ .add('Direct (Blocked)', () => {
+ return (
+
+
+ );
+ })
+ .add('Group', () => {
+ return (
+
+
+ );
+ })
+ .add('Group (Blocked)', () => {
+ return (
+
+
+ );
+ });
diff --git a/ts/components/conversation/MessageRequestActions.tsx b/ts/components/conversation/MessageRequestActions.tsx
new file mode 100644
index 000000000000..a9dd6ed25592
--- /dev/null
+++ b/ts/components/conversation/MessageRequestActions.tsx
@@ -0,0 +1,130 @@
+import * as React from 'react';
+import classNames from 'classnames';
+import { ContactName, Props as ContactNameProps } from './ContactName';
+import {
+ MessageRequestActionsConfirmation,
+ MessageRequestState,
+ Props as MessageRequestActionsConfirmationProps,
+} from './MessageRequestActionsConfirmation';
+import { Intl } from '../Intl';
+import { LocalizerType } from '../../types/Util';
+
+export type Props = {
+ i18n: LocalizerType;
+ onAccept(): unknown;
+} & Omit
+
+
+ );
+};
diff --git a/ts/components/conversation/MessageRequestActionsConfirmation.tsx b/ts/components/conversation/MessageRequestActionsConfirmation.tsx
new file mode 100644
index 000000000000..7fb2b27dc614
--- /dev/null
+++ b/ts/components/conversation/MessageRequestActionsConfirmation.tsx
@@ -0,0 +1,156 @@
+import * as React from 'react';
+import { ContactName, Props as ContactNameProps } from './ContactName';
+import { ConfirmationModal } from '../ConfirmationModal';
+import { Intl } from '../Intl';
+import { LocalizerType } from '../../types/Util';
+
+export enum MessageRequestState {
+ blocking,
+ deleting,
+ unblocking,
+ default,
+}
+
+export type Props = {
+ i18n: LocalizerType;
+ conversationType: 'group' | 'direct';
+ isBlocked?: boolean;
+ onBlock(): unknown;
+ onBlockAndDelete(): unknown;
+ onUnblock(): unknown;
+ onDelete(): unknown;
+ state: MessageRequestState;
+ onChangeState(state: MessageRequestState): unknown;
+} & Omit
+
+ {isBlocked ? (
+
+ ) : (
+
+ )}
+
+ {!isBlocked ? (
+
+ ) : null}
+
+
+ {renderHeroRow(id, this.resizeHeroRow)}
+
+ );
+ } else if (!haveOldest && row === 0) {
rowContents = (
{renderLoadingRow(id)}
@@ -574,13 +586,10 @@ export class Timeline extends React.PureComponent {
};
public fromItemIndexToRow(index: number) {
- const { haveOldest, oldestUnreadIndex } = this.props;
+ const { oldestUnreadIndex } = this.props;
- let addition = 0;
-
- if (!haveOldest) {
- addition += 1;
- }
+ // We will always render either the hero row or the loading row
+ let addition = 1;
if (isNumber(oldestUnreadIndex) && index >= oldestUnreadIndex) {
addition += 1;
@@ -590,15 +599,12 @@ export class Timeline extends React.PureComponent {
}
public getRowCount() {
- const { haveOldest, oldestUnreadIndex, typingContact } = this.props;
+ const { oldestUnreadIndex, typingContact } = this.props;
const { items } = this.props;
const itemsCount = items && items.length ? items.length : 0;
- let extraRows = 0;
-
- if (!haveOldest) {
- extraRows += 1;
- }
+ // We will always render either the hero row or the loading row
+ let extraRows = 1;
if (isNumber(oldestUnreadIndex)) {
extraRows += 1;
@@ -612,13 +618,10 @@ export class Timeline extends React.PureComponent {
}
public fromRowToItemIndex(row: number, props?: Props): number | undefined {
- const { haveOldest, items } = props || this.props;
+ const { items } = props || this.props;
- let subtraction = 0;
-
- if (!haveOldest) {
- subtraction += 1;
- }
+ // We will always render either the hero row or the loading row
+ let subtraction = 1;
const oldestUnreadRow = this.getLastSeenIndicatorRow();
if (isNumber(oldestUnreadRow) && row > oldestUnreadRow) {
diff --git a/ts/components/conversation/TimelineItem.stories.tsx b/ts/components/conversation/TimelineItem.stories.tsx
index d6ee5291650b..781788f5007b 100644
--- a/ts/components/conversation/TimelineItem.stories.tsx
+++ b/ts/components/conversation/TimelineItem.stories.tsx
@@ -30,6 +30,7 @@ const renderEmojiPicker: TimelineItemProps['renderEmojiPicker'] = ({
const getDefaultProps = () => ({
conversationId: 'conversation-id',
+ conversationAccepted: true,
id: 'asdf',
isSelected: false,
selectMessage: action('selectMessage'),
diff --git a/ts/components/conversation/TimelineItem.tsx b/ts/components/conversation/TimelineItem.tsx
index a96d16458bb0..4f1b46ba8d66 100644
--- a/ts/components/conversation/TimelineItem.tsx
+++ b/ts/components/conversation/TimelineItem.tsx
@@ -77,6 +77,7 @@ export type TimelineItemType =
type PropsLocalType = {
conversationId: string;
+ conversationAccepted: boolean;
item?: TimelineItemType;
id: string;
isSelected: boolean;
diff --git a/ts/components/stickers/StickerManagerPackRow.tsx b/ts/components/stickers/StickerManagerPackRow.tsx
index b7bb7f37a0d1..b9f0a95145b3 100644
--- a/ts/components/stickers/StickerManagerPackRow.tsx
+++ b/ts/components/stickers/StickerManagerPackRow.tsx
@@ -92,8 +92,13 @@ export const StickerManagerPackRow = React.memo(
{i18n('stickers--StickerManager--UninstallWarning')}
diff --git a/ts/components/stickers/StickerPreviewModal.tsx b/ts/components/stickers/StickerPreviewModal.tsx
index 5be8f9ecdd31..1cb76e9917cd 100644
--- a/ts/components/stickers/StickerPreviewModal.tsx
+++ b/ts/components/stickers/StickerPreviewModal.tsx
@@ -174,8 +174,13 @@ export const StickerPreviewModal = React.memo(
{i18n('stickers--StickerManager--UninstallWarning')}
diff --git a/ts/sql/Client.ts b/ts/sql/Client.ts
index 61dd1ae47ab4..3b38ef876080 100644
--- a/ts/sql/Client.ts
+++ b/ts/sql/Client.ts
@@ -852,8 +852,8 @@ async function searchMessagesInConversation(
// Message
-async function getMessageCount() {
- return channels.getMessageCount();
+async function getMessageCount(conversationId?: string) {
+ return channels.getMessageCount(conversationId);
}
async function saveMessage(
diff --git a/ts/sql/Interface.ts b/ts/sql/Interface.ts
index bd6ca9f4330c..547ff84e58f9 100644
--- a/ts/sql/Interface.ts
+++ b/ts/sql/Interface.ts
@@ -85,7 +85,7 @@ export interface DataInterface {
options?: { limit?: number }
) => Promise>;
- getMessageCount: () => Promise;
+ getMessageCount: (conversationId?: string) => Promise;
saveMessages: (
arrayOfMessages: Array,
options: { forceSave?: boolean }
diff --git a/ts/sql/Server.ts b/ts/sql/Server.ts
index 7e7cbfa2b00b..d4a7401f6249 100644
--- a/ts/sql/Server.ts
+++ b/ts/sql/Server.ts
@@ -1542,6 +1542,40 @@ async function updateToSchemaVersion20(
}
}
+async function updateToSchemaVersion21(
+ currentVersion: number,
+ instance: PromisifiedSQLDatabase
+) {
+ if (currentVersion >= 21) {
+ return;
+ }
+ try {
+ await instance.run('BEGIN TRANSACTION;');
+ await instance.run(`
+ UPDATE conversations
+ SET json = json_set(
+ json,
+ '$.messageCount',
+ (SELECT count(*) FROM messages WHERE messages.conversationId = conversations.id)
+ );
+ `);
+ await instance.run(`
+ UPDATE conversations
+ SET json = json_set(
+ json,
+ '$.sentMessageCount',
+ (SELECT count(*) FROM messages WHERE messages.conversationId = conversations.id AND messages.type = 'outgoing')
+ );
+ `);
+ await instance.run('PRAGMA user_version = 21;');
+ await instance.run('COMMIT TRANSACTION;');
+ console.log('updateToSchemaVersion21: success!');
+ } catch (error) {
+ await instance.run('ROLLBACK');
+ throw error;
+ }
+}
+
const SCHEMA_VERSIONS = [
updateToSchemaVersion1,
updateToSchemaVersion2,
@@ -1563,6 +1597,7 @@ const SCHEMA_VERSIONS = [
updateToSchemaVersion18,
updateToSchemaVersion19,
updateToSchemaVersion20,
+ updateToSchemaVersion21,
];
async function updateSchema(instance: PromisifiedSQLDatabase) {
@@ -2326,9 +2361,14 @@ async function searchMessagesInConversation(
}));
}
-async function getMessageCount() {
+async function getMessageCount(conversationId?: string) {
const db = getInstance();
- const row = await db.get('SELECT count(*) from messages;');
+ const row = conversationId
+ ? await db.get(
+ 'SELECT count(*) from messages WHERE conversationId = $conversationId;',
+ { $conversationId: conversationId }
+ )
+ : await db.get('SELECT count(*) from messages;');
if (!row) {
throw new Error('getMessageCount: Unable to get count of messages');
diff --git a/ts/state/ducks/conversations.ts b/ts/state/ducks/conversations.ts
index bf1a26a4109e..a4e6ff9104a9 100644
--- a/ts/state/ducks/conversations.ts
+++ b/ts/state/ducks/conversations.ts
@@ -12,6 +12,7 @@ import {
import { trigger } from '../../shims/events';
import { NoopActionType } from './noop';
import { AttachmentType } from '../../types/Attachment';
+import { ColorType } from '../../types/Util';
// State
@@ -24,7 +25,11 @@ export type DBConversationType = {
export type ConversationType = {
id: string;
name?: string;
- isArchived: boolean;
+ profileName?: string;
+ avatarPath?: string;
+ color?: ColorType;
+ isArchived?: boolean;
+ isBlocked?: boolean;
activeAt?: number;
timestamp: number;
inboxPosition: number;
@@ -33,6 +38,7 @@ export type ConversationType = {
text: string;
};
phoneNumber: string;
+ membersCount?: number;
type: 'direct' | 'group';
isMe: boolean;
lastUpdated: number;
@@ -49,6 +55,9 @@ export type ConversationType = {
shouldShowDraft?: boolean;
draftText?: string;
draftPreview?: string;
+
+ messageRequestsEnabled?: boolean;
+ acceptedMessageRequest?: boolean;
};
export type ConversationLookupType = {
[key: string]: ConversationType;
diff --git a/ts/state/smart/CompositionArea.tsx b/ts/state/smart/CompositionArea.tsx
index e6c560fd9a6c..7888f9527202 100644
--- a/ts/state/smart/CompositionArea.tsx
+++ b/ts/state/smart/CompositionArea.tsx
@@ -71,6 +71,14 @@ const mapStateToProps = (state: StateType, props: ExternalProps) => {
recentStickers,
showIntroduction,
showPickerHint,
+ // Message Requests
+ messageRequestsEnabled: conversation.messageRequestsEnabled,
+ acceptedMessageRequest: conversation.acceptedMessageRequest,
+ isBlocked: conversation.isBlocked,
+ conversationType: conversation.type,
+ name: conversation.name,
+ profileName: conversation.profileName,
+ phoneNumber: conversation.phoneNumber,
};
};
diff --git a/ts/state/smart/HeroRow.tsx b/ts/state/smart/HeroRow.tsx
new file mode 100644
index 000000000000..345a5e3af574
--- /dev/null
+++ b/ts/state/smart/HeroRow.tsx
@@ -0,0 +1,37 @@
+import { connect } from 'react-redux';
+import { mapDispatchToProps } from '../actions';
+
+import { ConversationHero } from '../../components/conversation/ConversationHero';
+
+import { StateType } from '../reducer';
+import { getIntl } from '../selectors/user';
+
+type ExternalProps = {
+ id: string;
+};
+
+const mapStateToProps = (state: StateType, props: ExternalProps) => {
+ const { id } = props;
+
+ const conversation = state.conversations.conversationLookup[id];
+
+ if (!conversation) {
+ throw new Error(`Did not find conversation ${id} in state!`);
+ }
+
+ return {
+ i18n: getIntl(state),
+ avatarPath: conversation.avatarPath,
+ color: conversation.color,
+ conversationType: conversation.type,
+ isMe: conversation.isMe,
+ membersCount: conversation.membersCount,
+ name: conversation.name,
+ phoneNumber: conversation.phoneNumber,
+ profileName: conversation.profileName,
+ };
+};
+
+const smart = connect(mapStateToProps, mapDispatchToProps);
+
+export const SmartHeroRow = smart(ConversationHero);
diff --git a/ts/state/smart/Timeline.tsx b/ts/state/smart/Timeline.tsx
index 2b2c0a06b3c2..f82de38fdb33 100644
--- a/ts/state/smart/Timeline.tsx
+++ b/ts/state/smart/Timeline.tsx
@@ -16,6 +16,7 @@ import {
import { SmartTimelineItem } from './TimelineItem';
import { SmartTypingBubble } from './TypingBubble';
import { SmartLastSeenIndicator } from './LastSeenIndicator';
+import { SmartHeroRow } from './HeroRow';
import { SmartTimelineLoadingRow } from './TimelineLoadingRow';
import { SmartEmojiPicker } from './EmojiPicker';
@@ -24,6 +25,7 @@ import { SmartEmojiPicker } from './EmojiPicker';
const FilteredSmartTimelineItem = SmartTimelineItem as any;
const FilteredSmartTypingBubble = SmartTypingBubble as any;
const FilteredSmartLastSeenIndicator = SmartLastSeenIndicator as any;
+const FilteredSmartHeroRow = SmartHeroRow as any;
const FilteredSmartTimelineLoadingRow = SmartTimelineLoadingRow as any;
type ExternalProps = {
@@ -66,6 +68,9 @@ function renderEmojiPicker({
function renderLastSeenIndicator(id: string): JSX.Element {
return ;
viewOnceOpen?: SyncMessageClass.ViewOnceOpen;
+ messageRequestResponse?: SyncMessageClass.MessageRequestResponse;
}
// Note: we need to use namespaces to express nested classes in Typescript
@@ -582,6 +583,13 @@ export declare namespace SyncMessageClass {
senderUuid?: string;
timestamp?: ProtoBinaryType;
}
+
+ class MessageRequestResponse {
+ threadE164?: string;
+ threadUuid?: string;
+ groupId?: ProtoBinaryType;
+ type?: number;
+ }
}
// Note: we need to use namespaces to express nested classes in Typescript
@@ -612,6 +620,16 @@ export declare namespace SyncMessageClass.StickerPackOperation {
}
}
+export declare namespace SyncMessageClass.MessageRequestResponse {
+ class Type {
+ static UNKNOWN: number;
+ static ACCEPT: number;
+ static DELETE: number;
+ static BLOCK: number;
+ static BLOCK_AND_DELETE: number;
+ }
+}
+
export declare class TypingMessageClass {
static decode: (
data: ArrayBuffer | ByteBufferClass,
diff --git a/ts/textsecure/MessageReceiver.ts b/ts/textsecure/MessageReceiver.ts
index ea5590d2cb78..5d61144ce552 100644
--- a/ts/textsecure/MessageReceiver.ts
+++ b/ts/textsecure/MessageReceiver.ts
@@ -42,6 +42,8 @@ declare global {
deliveryReceipt?: any;
error?: any;
groupDetails?: any;
+ groupId?: string;
+ messageRequestResponseType?: number;
proto?: any;
read?: any;
reason?: any;
@@ -51,6 +53,8 @@ declare global {
source?: any;
sourceUuid?: any;
stickerPacks?: any;
+ threadE164?: string;
+ threadUuid?: string;
timestamp?: any;
typing?: any;
verified?: any;
@@ -1119,6 +1123,22 @@ class MessageReceiverInner extends EventTarget {
) {
p = this.handleEndSession(destination);
}
+
+ if (
+ msg.flags &&
+ msg.flags &
+ window.textsecure.protobuf.DataMessage.Flags.PROFILE_KEY_UPDATE
+ ) {
+ const ev = new Event('profileKeyUpdate');
+ ev.confirm = this.removeFromCache.bind(this, envelope);
+ ev.data = {
+ source: envelope.source,
+ sourceUuid: envelope.sourceUuid,
+ profileKey: msg.profileKey.toString('base64'),
+ };
+ return this.dispatchAndWait(ev);
+ }
+
return p.then(async () =>
this.processDecrypted(envelope, msg).then(message => {
const groupId = message.group && message.group.id;
@@ -1373,6 +1393,11 @@ class MessageReceiverInner extends EventTarget {
);
} else if (syncMessage.viewOnceOpen) {
return this.handleViewOnceOpen(envelope, syncMessage.viewOnceOpen);
+ } else if (syncMessage.messageRequestResponse) {
+ return this.handleMessageRequestResponse(
+ envelope,
+ syncMessage.messageRequestResponse
+ );
}
this.removeFromCache(envelope);
@@ -1408,6 +1433,27 @@ class MessageReceiverInner extends EventTarget {
return this.dispatchAndWait(ev);
}
+ async handleMessageRequestResponse(
+ envelope: EnvelopeClass,
+ sync: SyncMessageClass.MessageRequestResponse
+ ) {
+ window.log.info('got message request response sync message');
+
+ const ev = new Event('messageRequestResponse');
+ ev.confirm = this.removeFromCache.bind(this, envelope);
+ ev.threadE164 = sync.threadE164;
+ ev.threadUuid = sync.threadUuid;
+ ev.groupId = sync.groupId ? sync.groupId.toString('binary') : null;
+ ev.messageRequestResponseType = sync.type;
+
+ window.normalizeUuids(
+ ev,
+ ['threadUuid'],
+ 'MessageReceiver::handleMessageRequestResponse'
+ );
+
+ return this.dispatchAndWait(ev);
+ }
async handleStickerPackOperation(
envelope: EnvelopeClass,
operations: Array
diff --git a/ts/textsecure/SendMessage.ts b/ts/textsecure/SendMessage.ts
index 34e8b60f1f7b..a8cb6f67f36a 100644
--- a/ts/textsecure/SendMessage.ts
+++ b/ts/textsecure/SendMessage.ts
@@ -74,7 +74,7 @@ type MessageOptionsType = {
};
needsSync?: boolean;
preview?: Array | null;
- profileKey?: string;
+ profileKey?: ArrayBuffer;
quote?: any;
recipients: Array;
sticker?: any;
@@ -93,7 +93,7 @@ class Message {
};
needsSync?: boolean;
preview: any;
- profileKey?: string;
+ profileKey?: ArrayBuffer;
quote?: any;
recipients: Array;
sticker?: any;
@@ -274,6 +274,8 @@ export type AttachmentType = {
caption: string;
attachmentPointer?: AttachmentPointerClass;
+
+ blurHash?: string;
};
export default class MessageSender {
@@ -348,6 +350,9 @@ export default class MessageSender {
if (attachment.caption) {
proto.caption = attachment.caption;
}
+ if (attachment.blurHash) {
+ proto.blurHash = attachment.blurHash;
+ }
return proto;
}
@@ -862,6 +867,31 @@ export default class MessageSender {
);
}
+ async sendProfileKeyUpdate(
+ profileKey: ArrayBuffer,
+ recipients: Array,
+ sendOptions: SendOptionsType,
+ groupId?: string
+ ) {
+ return this.sendMessage(
+ {
+ recipients,
+ timestamp: Date.now(),
+ profileKey,
+ flags: window.textsecure.protobuf.DataMessage.Flags.PROFILE_KEY_UPDATE,
+ ...(groupId
+ ? {
+ group: {
+ id: groupId,
+ type: window.textsecure.protobuf.GroupContext.Type.DELIVER,
+ },
+ }
+ : {}),
+ },
+ sendOptions
+ );
+ }
+
async sendDeliveryReceipt(
recipientE164: string,
recipientUuid: string,
@@ -985,6 +1015,48 @@ export default class MessageSender {
);
}
+ async syncMessageRequestResponse(
+ responseArgs: {
+ threadE164?: string;
+ threadUuid?: string;
+ groupId?: string;
+ type: number;
+ },
+ sendOptions?: SendOptionsType
+ ) {
+ const myNumber = window.textsecure.storage.user.getNumber();
+ const myUuid = window.textsecure.storage.user.getUuid();
+ const myDevice = window.textsecure.storage.user.getDeviceId();
+ if (myDevice === 1 || myDevice === '1') {
+ return null;
+ }
+
+ const syncMessage = this.createSyncMessage();
+
+ const response = new window.textsecure.protobuf.SyncMessage.MessageRequestResponse();
+ response.threadE164 = responseArgs.threadE164;
+ response.threadUuid = responseArgs.threadUuid;
+ response.groupId = responseArgs.groupId
+ ? window.Signal.Crypto.fromEncodedBinaryToArrayBuffer(
+ responseArgs.groupId
+ )
+ : null;
+ response.type = responseArgs.type;
+ syncMessage.messageRequestResponse = response;
+
+ const contentMessage = new window.textsecure.protobuf.Content();
+ contentMessage.syncMessage = syncMessage;
+
+ const silent = true;
+ return this.sendIndividualProto(
+ myUuid || myNumber,
+ contentMessage,
+ Date.now(),
+ silent,
+ sendOptions
+ );
+ }
+
async sendStickerPackSync(
operations: Array<{
packId: string;
@@ -1152,7 +1224,7 @@ export default class MessageSender {
reaction: any,
timestamp: number,
expireTimer: number | undefined,
- profileKey?: string,
+ profileKey?: ArrayBuffer,
flags?: number
) {
const attributes = {
@@ -1195,7 +1267,7 @@ export default class MessageSender {
reaction: any,
timestamp: number,
expireTimer: number | undefined,
- profileKey?: string,
+ profileKey?: ArrayBuffer,
options?: SendOptionsType
) {
return this.sendMessage(
@@ -1308,7 +1380,7 @@ export default class MessageSender {
reaction: any,
timestamp: number,
expireTimer: number | undefined,
- profileKey?: string,
+ profileKey?: ArrayBuffer,
options?: SendOptionsType
) {
const myE164 = window.textsecure.storage.user.getNumber();
@@ -1480,7 +1552,7 @@ export default class MessageSender {
groupIdentifiers: Array,
expireTimer: number | undefined,
timestamp: number,
- profileKey?: string,
+ profileKey?: ArrayBuffer,
options?: SendOptionsType
) {
const myNumber = window.textsecure.storage.user.getNumber();
@@ -1517,7 +1589,7 @@ export default class MessageSender {
identifier: string,
expireTimer: number | undefined,
timestamp: number,
- profileKey?: string,
+ profileKey?: ArrayBuffer,
options?: SendOptionsType
) {
return this.sendMessage(
diff --git a/ts/textsecure/WebAPI.ts b/ts/textsecure/WebAPI.ts
index 04dd5716cbce..3595740bc632 100644
--- a/ts/textsecure/WebAPI.ts
+++ b/ts/textsecure/WebAPI.ts
@@ -489,6 +489,7 @@ const URL_CALLS = {
signed: 'v2/keys/signed',
getStickerPackUpload: 'v1/sticker/pack/form',
whoami: 'v1/accounts/whoami',
+ config: 'v1/config',
};
type InitializeOptionsType = {
@@ -604,6 +605,7 @@ export type WebAPIType = {
setSignedPreKey: (signedPreKey: SignedPreKeyType) => Promise;
updateDeviceName: (deviceName: string) => Promise;
whoami: () => Promise;
+ getConfig: () => Promise>;
};
export type SignedPreKeyType = {
@@ -724,9 +726,10 @@ export function initialize({
setSignedPreKey,
updateDeviceName,
whoami,
+ getConfig,
};
- async function _ajax(param: AjaxOptionsType) {
+ async function _ajax(param: AjaxOptionsType): Promise {
if (!param.urlParameters) {
param.urlParameters = '';
}
@@ -792,6 +795,21 @@ export function initialize({
});
}
+ async function getConfig() {
+ type ResType = {
+ config: Array<{ name: string; enabled: boolean }>;
+ };
+ const res: ResType = await _ajax({
+ call: 'config',
+ httpType: 'GET',
+ responseType: 'json',
+ });
+
+ return res.config.filter(({ name }: { name: string }) =>
+ name.startsWith('desktop.')
+ );
+ }
+
async function getSenderCertificate() {
return _ajax({
call: 'deliveryCert',
diff --git a/ts/types/Attachment.ts b/ts/types/Attachment.ts
index 3a557ea2f9d7..736798a34c36 100644
--- a/ts/types/Attachment.ts
+++ b/ts/types/Attachment.ts
@@ -18,6 +18,7 @@ const MIN_HEIGHT = 50;
// Used for display
export interface AttachmentType {
+ blurHash?: string;
caption?: string;
contentType: MIME.MIMEType;
fileName: string;
@@ -133,7 +134,7 @@ export function hasImage(attachments?: Array) {
return (
attachments &&
attachments[0] &&
- (attachments[0].url || attachments[0].pending)
+ (attachments[0].url || attachments[0].pending || attachments[0].blurHash)
);
}
diff --git a/ts/util/imageToBlurHash.ts b/ts/util/imageToBlurHash.ts
new file mode 100644
index 000000000000..1cddd4add3a4
--- /dev/null
+++ b/ts/util/imageToBlurHash.ts
@@ -0,0 +1,50 @@
+import loadImage from 'blueimp-load-image';
+import { encode } from 'blurhash';
+
+type Input = Parameters[0];
+
+const loadImageData = async (input: Input): Promise => {
+ return new Promise((resolve, reject) => {
+ loadImage(
+ input,
+ canvasOrError => {
+ if (canvasOrError instanceof Event && canvasOrError.type === 'error') {
+ const processError = new Error(
+ 'imageToBlurHash: Failed to process image'
+ );
+ processError.cause = canvasOrError;
+ reject(processError);
+ return;
+ }
+ if (canvasOrError instanceof HTMLCanvasElement) {
+ const context = canvasOrError.getContext('2d');
+ resolve(
+ context?.getImageData(
+ 0,
+ 0,
+ canvasOrError.width,
+ canvasOrError.height
+ )
+ );
+ }
+ const error = new Error(
+ 'imageToBlurHash: Failed to place image on canvas'
+ );
+ reject(error);
+ return;
+ },
+ // Calculating the blurhash on large images is a long-running and
+ // synchronous operation, so here we ensure the images are a reasonable
+ // size before calculating the blurhash. iOS uses a max size of 200x200
+ // and Android uses a max size of 1/16 the original size. 200x200 is
+ // easier for us.
+ { canvas: true, orientation: true, maxWidth: 200, maxHeight: 200 }
+ );
+ });
+};
+
+export const imageToBlurHash = async (input: Input) => {
+ const { data, width, height } = await loadImageData(input);
+ // 4 horizontal components and 3 vertical components
+ return encode(data, width, height, 4, 3);
+};
diff --git a/ts/util/lint/exceptions.json b/ts/util/lint/exceptions.json
index 9dc72ba74104..b5a64eb05cf5 100644
--- a/ts/util/lint/exceptions.json
+++ b/ts/util/lint/exceptions.json
@@ -219,6 +219,14 @@
"reasonCategory": "usageTrusted",
"updated": "2020-03-25T15:45:04.024Z"
},
+ {
+ "rule": "jQuery-wrap(",
+ "path": "js/models/conversations.js",
+ "line": " await wrap(",
+ "lineNumber": 641,
+ "reasonCategory": "falseMatch",
+ "updated": "2020-05-27T21:15:43.044Z"
+ },
{
"rule": "jQuery-append(",
"path": "js/modules/debuglogs.js",
@@ -570,7 +578,7 @@
"line": " if (e && this.$(e.target).closest('.capture-audio').length > 0) {",
"lineNumber": 198,
"reasonCategory": "usageTrusted",
- "updated": "2019-10-21T22:30:15.622Z",
+ "updated": "2020-05-20T20:10:43.540Z",
"reasonDetail": "Known DOM elements"
},
{
@@ -579,7 +587,7 @@
"line": " this.$('.conversation:first .recorder').trigger('close');",
"lineNumber": 201,
"reasonCategory": "usageTrusted",
- "updated": "2019-10-21T22:30:15.622Z",
+ "updated": "2020-05-20T20:10:43.540Z",
"reasonDetail": "Hardcoded selector"
},
{
@@ -11426,18 +11434,18 @@
"rule": "DOM-innerHTML",
"path": "ts/components/CompositionArea.js",
"line": " el.innerHTML = '';",
- "lineNumber": 22,
+ "lineNumber": 23,
"reasonCategory": "usageTrusted",
- "updated": "2019-08-01T14:10:37.481Z",
+ "updated": "2020-05-20T20:10:43.540Z",
"reasonDetail": "Our code, no user input, only clearing out the dom"
},
{
"rule": "DOM-innerHTML",
"path": "ts/components/CompositionArea.tsx",
"line": " el.innerHTML = '';",
- "lineNumber": 73,
+ "lineNumber": 80,
"reasonCategory": "usageTrusted",
- "updated": "2019-12-16T14:36:25.614ZZ",
+ "updated": "2020-06-03T19:23:21.195Z",
"reasonDetail": "Our code, no user input, only clearing out the dom"
},
{
@@ -11507,9 +11515,9 @@
"rule": "React-createRef",
"path": "ts/components/conversation/ConversationHeader.tsx",
"line": " this.menuTriggerRef = React.createRef();",
- "lineNumber": 67,
+ "lineNumber": 68,
"reasonCategory": "usageTrusted",
- "updated": "2019-07-31T00:19:18.696Z",
+ "updated": "2020-05-20T20:10:43.540Z",
"reasonDetail": "Used to reference popup menu"
},
{
@@ -11553,7 +11561,7 @@
"line": " public audioRef: React.RefObject = React.createRef();",
"lineNumber": 184,
"reasonCategory": "usageTrusted",
- "updated": "2020-04-30T15:59:13.160Z"
+ "updated": "2020-05-21T16:56:07.875Z"
},
{
"rule": "React-createRef",
@@ -11561,7 +11569,7 @@
"line": " > = React.createRef();",
"lineNumber": 188,
"reasonCategory": "usageTrusted",
- "updated": "2020-04-30T15:59:13.160Z"
+ "updated": "2020-05-21T16:56:07.875Z"
},
{
"rule": "React-createRef",
@@ -11784,4 +11792,4 @@
"reasonCategory": "falseMatch",
"updated": "2020-04-05T23:45:16.746Z"
}
-]
\ No newline at end of file
+]
diff --git a/ts/window.d.ts b/ts/window.d.ts
index adf8e502e807..5a3909aeea50 100644
--- a/ts/window.d.ts
+++ b/ts/window.d.ts
@@ -31,7 +31,7 @@ declare global {
storage: {
put: (key: string, value: any) => void;
remove: (key: string) => void;
- get: (key: string) => any;
+ get: (key: string) => T | undefined;
};
textsecure: TextSecureType;
@@ -48,6 +48,10 @@ declare global {
WebAPI: WebAPIConnectType;
Whisper: WhisperType;
}
+
+ interface Error {
+ cause?: Event;
+ }
}
export type ConversationType = {
diff --git a/yarn.lock b/yarn.lock
index 028c8fcd5e2d..89c213602fc2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2052,6 +2052,13 @@
"@types/jquery" "*"
"@types/underscore" "*"
+"@types/blueimp-load-image@2.23.6":
+ version "2.23.6"
+ resolved "https://registry.yarnpkg.com/@types/blueimp-load-image/-/blueimp-load-image-2.23.6.tgz#2ccf3c69bd17c5bd1f4471470505a7f065a84a9f"
+ integrity sha512-RF5EQ2miGm/o5XmZk0PhpLnikXOwe1BxGJVikYcNhwr4s7i7LqVc4U51k/zFTD11GeqyK+yz6vWwvvtoKsPYLw==
+ dependencies:
+ "@types/node" "*"
+
"@types/body-parser@*":
version "1.17.1"
resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.17.1.tgz#18fcf61768fb5c30ccc508c21d6fd2e8b3bf7897"
@@ -3957,6 +3964,11 @@ blueimp-load-image@2.18.0:
resolved "https://registry.yarnpkg.com/blueimp-load-image/-/blueimp-load-image-2.18.0.tgz#03b93687eb382a7136cfbcbd4f0e936b6763fc0e"
integrity sha512-GUrxVE/7FpzAw/WU6GMiI3v+LpFmlAxp7sF36EQB8rGAg97ND8iTeYZ3FQbhsxS5s2dNarGKZEWhKPNKKSmMuA==
+blurhash@1.1.3:
+ version "1.1.3"
+ resolved "https://registry.yarnpkg.com/blurhash/-/blurhash-1.1.3.tgz#dc325af7da836d07a0861d830bdd63694382483e"
+ integrity sha512-yUhPJvXexbqbyijCIE/T2NCXcj9iNPhWmOKbPTuR/cm7Q5snXYIfnVnz6m7MWOXxODMz/Cr3UcVkRdHiuDVRDw==
+
bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.4.0:
version "4.11.8"
resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.8.tgz#2cde09eb5ee341f484746bb0309b3253b1b1442f"
@@ -13579,6 +13591,11 @@ rc@^1.1.2:
minimist "^1.2.0"
strip-json-comments "~2.0.1"
+react-blurhash@0.1.2:
+ version "0.1.2"
+ resolved "https://registry.yarnpkg.com/react-blurhash/-/react-blurhash-0.1.2.tgz#16bdce59be4f48dc7816a26e8f0435f73d3a2bb2"
+ integrity sha512-p7TAQ+Qw78rBO9LSxkURfNDJA8TGAuOW2GVJKzNHrOY61XtA02PYmpAY9lotbFpftczEXZ7h4Su2JRmEUI7/Hw==
+
react-clientside-effect@^1.2.0:
version "1.2.2"
resolved "https://registry.yarnpkg.com/react-clientside-effect/-/react-clientside-effect-1.2.2.tgz#6212fb0e07b204e714581dd51992603d1accc837"