Merge branch 'develop' into feat-remove-fetch-blob

android/app/build.gradle

@@ -147,7 +147,7 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode VERSIONCODE as Integer
-        versionName "4.48.0"
+        versionName "4.49.0"
         vectorDrawables.useSupportLibrary = true
         if (!isFoss) {
             manifestPlaceholders = [BugsnagAPIKey: BugsnagAPIKey as String]

app/containers/MessageComposer/components/RecordAudio/RecordAudio.tsx

@@ -95,21 +95,16 @@ export const RecordAudio = (): ReactElement | null => {
 		try {
 			if (!rid) return;
 			setRecordingAudio(false);
-			const fileURI = recordingRef.current?.getURI() as string;
-			const fileData = await getInfoAsync(fileURI);
-
-			if (!fileData.exists) {
-				return;
-			}
-
-			const fileInfo: IUpload = {
-				rid,
+			const fileURI = recordingRef.current?.getURI();
+			const fileData = await getInfoAsync(fileURI as string);
+			const fileInfo = {
 				name: `${Date.now()}${RECORDING_EXTENSION}`,
+				mime: 'audio/aac',
 				type: 'audio/aac',
 				store: 'Uploads',
 				path: fileURI,
-				size: fileData.size
-			};
+				size: fileData.exists ? fileData.size : null
+			} as IUpload;
 
 			if (fileInfo) {
 				if (permissionToUpload) {

app/containers/MessageComposer/hooks/useChooseMedia.ts

@@ -136,7 +136,7 @@ export const useChooseMedia = ({
 			// FIXME: use useNavigation
 			Navigation.navigate('ShareView', {
 				room,
-				thread,
+				thread: thread || tmid,
 				attachments,
 				action,
 				finishShareView,

app/containers/message/Attachments.tsx

@@ -55,14 +55,14 @@ const AttachedActions = ({ attachment, getCustomEmoji }: { attachment: IAttachme
 
 const Attachments: React.FC<IMessageAttachments> = React.memo(
 	({ attachments, timeFormat, showAttachment, style, getCustomEmoji, isReply, author }: IMessageAttachments) => {
-		const { translateLanguage, isEncrypted } = useContext(MessageContext);
+		const { translateLanguage } = useContext(MessageContext);
 
 		if (!attachments || attachments.length === 0) {
 			return null;
 		}
 
 		const attachmentsElements = attachments.map((file: IAttachment, index: number) => {
-			const msg = isEncrypted ? '' : getMessageFromAttachment(file, translateLanguage);
+			const msg = getMessageFromAttachment(file, translateLanguage);
 			if (file && file.image_url) {
 				return (
 					<Image

app/containers/message/Components/RightIcons/Pinned.tsx

@@ -0,0 +1,11 @@
+import React from 'react';
+
+import { CustomIcon } from '../../../CustomIcon';
+import styles from '../../styles';
+
+const Pinned = ({ pinned, testID }: { pinned?: boolean; testID?: string }): React.ReactElement | null => {
+	if (pinned) return <CustomIcon testID={testID} name='pin' size={16} style={styles.rightIcons} />;
+	return null;
+};
+
+export default Pinned;

app/containers/message/Components/RightIcons/index.tsx

@@ -1,12 +1,13 @@
 import React from 'react';
 import { StyleSheet, View } from 'react-native';
 
-import Encrypted from './Encrypted';
+import { MessageType } from '../../../../definitions';
 import Edited from './Edited';
+import Encrypted from './Encrypted';
 import MessageError from './MessageError';
+import Pinned from './Pinned';
 import ReadReceipt from './ReadReceipt';
 import Translated from './Translated';
-import { MessageType } from '../../../../definitions';
 
 const styles = StyleSheet.create({
 	actionIcons: {
@@ -22,10 +23,21 @@ interface IRightIcons {
 	unread?: boolean;
 	hasError: boolean;
 	isTranslated: boolean;
+	pinned?: boolean;
 }
 
-const RightIcons = ({ type, msg, isEdited, hasError, isReadReceiptEnabled, unread, isTranslated }: IRightIcons) => (
+const RightIcons = ({
+	type,
+	msg,
+	isEdited,
+	hasError,
+	isReadReceiptEnabled,
+	unread,
+	isTranslated,
+	pinned
+}: IRightIcons): React.ReactElement => (
 	<View style={styles.actionIcons}>
+		<Pinned pinned={pinned} testID={`${msg}-pinned`} />
 		<Encrypted type={type} />
 		<Edited testID={`${msg}-edited`} isEdited={isEdited} />
 		<MessageError hasError={hasError} />

app/containers/message/Message.stories.tsx

@@ -127,6 +127,13 @@ export const Edited = () => (
 	</>
 );
 
+export const Pinned = () => (
+	<>
+		<Message msg='Message header' pinned />
+		<Message msg='Message without header' pinned isHeader={false} />
+	</>
+);
+
 export const Translated = () => (
 	<>
 		<Message msg='Message header' isTranslated />

app/containers/message/Message.tsx

@@ -117,6 +117,7 @@ const Message = React.memo((props: IMessage) => {
 						hasError={props.hasError}
 						isReadReceiptEnabled={props.isReadReceiptEnabled}
 						unread={props.unread}
+						pinned={props.pinned}
 						isTranslated={props.isTranslated}
 					/>
 				) : null}

app/containers/message/User.tsx

@@ -60,6 +60,7 @@ interface IMessageUser {
 	isEdited: boolean;
 	isReadReceiptEnabled?: boolean;
 	unread?: boolean;
+	pinned?: boolean;
 	isTranslated: boolean;
 }
 
@@ -124,6 +125,7 @@ const User = React.memo(
 						hasError={hasError}
 						isReadReceiptEnabled={props.isReadReceiptEnabled}
 						unread={props.unread}
+						pinned={props.pinned}
 						isTranslated={isTranslated}
 					/>
 				</View>

app/containers/message/index.tsx

@@ -390,7 +390,8 @@ class MessageContainer extends React.Component<IMessageContainerProps, IMessageC
 			autoTranslate: autoTranslateMessage,
 			replies,
 			md,
-			comment
+			comment,
+			pinned
 		} = item;
 
 		let message = msg;
@@ -428,8 +429,7 @@ class MessageContainer extends React.Component<IMessageContainerProps, IMessageC
 					threadBadgeColor,
 					toggleFollowThread,
 					replies,
-					translateLanguage: canTranslateMessage ? autoTranslateLanguage : undefined,
-					isEncrypted: this.isEncrypted
+					translateLanguage: canTranslateMessage ? autoTranslateLanguage : undefined
 				}}
 			>
 				{/* @ts-ignore*/}
@@ -486,6 +486,7 @@ class MessageContainer extends React.Component<IMessageContainerProps, IMessageC
 					isTranslated={isTranslated}
 					isBeingEdited={isBeingEdited}
 					isPreview={isPreview}
+					pinned={pinned}
 				/>
 			</MessageContext.Provider>
 		);

app/containers/message/interfaces.ts

@@ -64,6 +64,7 @@ export interface IMessageContent {
 	hasError: boolean;
 	isHeader: boolean;
 	isTranslated: boolean;
+	pinned?: boolean;
 }
 
 export interface IMessageEmoji {

app/definitions/IUpload.ts

@@ -1,10 +1,8 @@
 import Model from '@nozbe/watermelondb/Model';
 
-import { E2EType, MessageType } from './IMessage';
-
 export interface IUpload {
 	id?: string;
-	rid: string;
+	rid?: string;
 	path: string;
 	name?: string;
 	tmid?: string;
@@ -16,8 +14,6 @@ export interface IUpload {
 	error?: boolean;
 	subscription?: { id: string };
 	msg?: string;
-	t?: MessageType;
-	e2e?: E2EType;
 }
 
 export type TUploadModel = IUpload & Model;

app/lib/encryption/encryption.ts

@@ -11,15 +11,7 @@ import log from '../methods/helpers/log';
 import { store } from '../store/auxStore';
 import { joinVectorData, randomPassword, splitVectorData, toString, utf8ToBuffer } from './utils';
 import { EncryptionRoom } from './index';
-import {
-	IMessage,
-	ISubscription,
-	IUpload,
-	TMessageModel,
-	TSubscriptionModel,
-	TThreadMessageModel,
-	TThreadModel
-} from '../../definitions';
+import { IMessage, ISubscription, TMessageModel, TSubscriptionModel, TThreadMessageModel, TThreadModel } from '../../definitions';
 import {
 	E2E_BANNER_TYPE,
 	E2E_MESSAGE_TYPE,
@@ -29,7 +21,6 @@ import {
 	E2E_STATUS
 } from '../constants';
 import { Services } from '../services';
-import { compareServerVersion } from '../methods/helpers';
 
 class Encryption {
 	ready: boolean;
@@ -43,7 +34,6 @@ class Encryption {
 			handshake: Function;
 			decrypt: Function;
 			encrypt: Function;
-			encryptUpload: Function;
 			importRoomKey: Function;
 		};
 	};
@@ -285,7 +275,7 @@ class Encryption {
 			];
 			toDecrypt = (await Promise.all(
 				toDecrypt.map(async message => {
-					const { t, msg, tmsg, attachments } = message;
+					const { t, msg, tmsg } = message;
 					let newMessage: TMessageModel = {} as TMessageModel;
 					if (message.subscription) {
 						const { id: rid } = message.subscription;
@@ -294,8 +284,7 @@ class Encryption {
 							t,
 							rid,
 							msg: msg as string,
-							tmsg,
-							attachments
+							tmsg
 						});
 					}
 
@@ -445,7 +434,7 @@ class Encryption {
 	};
 
 	// Encrypt a message
-	encryptMessage = async (message: IMessage | IUpload) => {
+	encryptMessage = async (message: IMessage) => {
 		const { rid } = message;
 		const db = database.active;
 		const subCollection = db.get('subscriptions');
@@ -467,11 +456,6 @@ class Encryption {
 			}
 
 			const roomE2E = await this.getRoomInstance(rid);
-
-			const { version: serverVersion } = store.getState().server;
-			if ('path' in message && compareServerVersion(serverVersion, 'greaterThanOrEqualTo', '6.8.0')) {
-				return roomE2E.encryptUpload(message);
-			}
 			return roomE2E.encrypt(message);
 		} catch {
 			// Subscription not found
@@ -483,7 +467,7 @@ class Encryption {
 	};
 
 	// Decrypt a message
-	decryptMessage = async (message: Pick<IMessage, 't' | 'e2e' | 'rid' | 'msg' | 'tmsg' | 'attachments'>) => {
+	decryptMessage = async (message: Pick<IMessage, 't' | 'e2e' | 'rid' | 'msg' | 'tmsg'>) => {
 		const { t, e2e } = message;
 
 		// Prevent create a new instance if this room was encrypted sometime ago

app/lib/encryption/room.ts

@@ -5,7 +5,7 @@ import ByteBuffer from 'bytebuffer';
 import parse from 'url-parse';
 
 import getSingleMessage from '../methods/getSingleMessage';
-import { IMessage, IUpload, IUser } from '../../definitions';
+import { IMessage, IUser } from '../../definitions';
 import Deferred from './helpers/deferred';
 import { debounce } from '../methods/helpers';
 import database from '../database';
@@ -243,38 +243,8 @@ export default class EncryptionRoom {
 		return message;
 	};
 
-	// Encrypt upload
-	encryptUpload = async (message: IUpload) => {
-		if (!this.ready) {
-			return message;
-		}
-
-		try {
-			let description = '';
-
-			if (message.description) {
-				description = await this.encryptText(EJSON.stringify({ text: message.description }));
-			}
-
-			return {
-				...message,
-				t: E2E_MESSAGE_TYPE,
-				e2e: E2E_STATUS.PENDING,
-				description
-			};
-		} catch {
-			// Do nothing
-		}
-
-		return message;
-	};
-
 	// Decrypt text
 	decryptText = async (msg: string | ArrayBuffer) => {
-		if (!msg) {
-			return null;
-		}
-
 		msg = b64ToBuffer(msg.slice(12) as string);
 		const [vector, cipherText] = splitVectorData(msg);
 
@@ -305,10 +275,6 @@ export default class EncryptionRoom {
 					tmsg = await this.decryptText(tmsg);
 				}
 
-				if (message.attachments?.length) {
-					message.attachments[0].description = await this.decryptText(message.attachments[0].description as string);
-				}
-
 				const decryptedMessage: IMessage = {
 					...message,
 					tmsg,

app/lib/methods/sendFileMessage.ts

@@ -5,11 +5,7 @@ import { Alert } from 'react-native';
 
 import { IUpload, IUser, TUploadModel } from '../../definitions';
 import i18n from '../../i18n';
-import { E2E_MESSAGE_TYPE } from '../constants';
 import database from '../database';
-import { Encryption } from '../encryption';
-import { store } from '../store/auxStore';
-import { compareServerVersion } from './helpers';
 import type { IFileUpload, Upload } from './helpers/fileUpload';
 import FileUpload from './helpers/fileUpload';
 import log from './helpers/log';
@@ -88,8 +84,6 @@ export function sendFileMessage(
 				}
 			}
 
-			const encryptedFileInfo = await Encryption.encryptMessage(fileInfo);
-
 			const formData: IFileUpload[] = [];
 			formData.push({
 				name: 'file',
@@ -101,7 +95,7 @@ export function sendFileMessage(
 			if (fileInfo.description) {
 				formData.push({
 					name: 'description',
-					data: encryptedFileInfo.description
+					data: fileInfo.description
 				});
 			}
 
@@ -119,18 +113,6 @@ export function sendFileMessage(
 				});
 			}
 
-			const { version: serverVersion } = store.getState().server;
-			if (encryptedFileInfo.t === E2E_MESSAGE_TYPE && compareServerVersion(serverVersion, 'greaterThanOrEqualTo', '6.8.0')) {
-				formData.push({
-					name: 't',
-					data: encryptedFileInfo.t
-				});
-				formData.push({
-					name: 'e2e',
-					data: encryptedFileInfo.e2e
-				});
-			}
-
 			const headers = {
 				...RocketChatSettings.customHeaders,
 				'Content-Type': 'multipart/form-data',

app/stacks/types.ts

@@ -276,7 +276,7 @@ export type InsideStackParamList = {
 		serverInfo: IServer;
 		text: string;
 		room: TSubscriptionModel;
-		thread: TThreadModel;
+		thread: TThreadModel | string;
 		action: TMessageAction;
 		finishShareView: (text?: string, selectedMessages?: string[]) => void | undefined;
 		startShareView: () => { text: string; selectedMessages: string[] };

app/views/CreateChannelView/RoomSettings/SwitchItemEncrypted.test.tsx

@@ -45,7 +45,7 @@ describe('SwitchItemEncrypted', () => {
 		const component = screen.queryByTestId(testEncrypted.testSwitchID);
 		expect(component).toBeTruthy();
 	});
-
+	
 	it('should change value of switch', () => {
 		render(
 			<SwitchItemEncrypted
@@ -62,7 +62,7 @@ describe('SwitchItemEncrypted', () => {
 			expect(onPressMock).toHaveReturnedWith({ value: !testEncrypted.encrypted });
 		}
 	});
-
+	
 	it('label when encrypted and isTeam are false and is a public channel', () => {
 		render(
 			<SwitchItemEncrypted
@@ -76,7 +76,7 @@ describe('SwitchItemEncrypted', () => {
 		const component = screen.queryByTestId(testEncrypted.testLabelID);
 		expect(component?.props.children).toBe(i18n.t('Channel_hint_encrypted_not_available'));
 	});
-
+	
 	it('label when encrypted and isTeam are true and is a private team', () => {
 		testEncrypted.isTeam = true;
 		testEncrypted.type = true;

app/views/ShareView/Header.tsx

@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { useEffect, useState } from 'react';
 import { StyleSheet, Text, View } from 'react-native';
 
 import I18n from '../../i18n';
@@ -9,6 +9,7 @@ import sharedStyles from '../Styles';
 import { makeThreadName } from '../../lib/methods/helpers/room';
 import { ISubscription, TThreadModel } from '../../definitions';
 import { getRoomTitle, isGroupChat, isAndroid, isTablet } from '../../lib/methods/helpers';
+import { getMessageById } from '../../lib/database/services/Message';
 
 const androidMarginLeft = isTablet ? 0 : 4;
 
@@ -36,13 +37,14 @@ const styles = StyleSheet.create({
 
 interface IHeader {
 	room: ISubscription;
-	thread: TThreadModel;
+	thread: TThreadModel | string;
 }
 
 const Header = React.memo(({ room, thread }: IHeader) => {
+	const [title, setTitle] = useState('');
 	const { theme } = useTheme();
 	let type;
-	if (thread?.id) {
+	if ((thread as TThreadModel)?.id || typeof thread === 'string') {
 		type = 'thread';
 	} else if (room?.prid) {
 		type = 'discussion';
@@ -70,12 +72,28 @@ const Header = React.memo(({ room, thread }: IHeader) => {
 
 	const textColor = themes[theme].fontDefault;
 
-	let title;
-	if (thread?.id) {
-		title = makeThreadName(thread);
-	} else {
-		title = getRoomTitle(room);
-	}
+	useEffect(() => {
+		(async () => {
+			if ((thread as TThreadModel)?.id) {
+				const name = makeThreadName(thread as TThreadModel);
+				if (name) {
+					setTitle(name);
+					return;
+				}
+			}
+			if (typeof thread === 'string') {
+				// only occurs when sending images and there is no message in the thread
+				const data = await getMessageById(thread);
+				const msg = data?.asPlain()?.msg;
+				if (msg) {
+					setTitle(msg);
+					return;
+				}
+			}
+			const name = getRoomTitle(room);
+			setTitle(name);
+		})();
+	}, []);
 
 	return (
 		<View style={styles.container}>

app/views/ShareView/index.tsx

@@ -43,7 +43,7 @@ interface IShareViewState {
 	attachments: IShareAttachment[];
 	text: string;
 	room: TSubscriptionModel;
-	thread: TThreadModel;
+	thread: TThreadModel | string;
 	maxFileSize?: number;
 	mediaAllowList?: string;
 	selectedMessages: string[];
@@ -88,7 +88,7 @@ class ShareView extends Component<IShareViewProps, IShareViewState> {
 			attachments: [],
 			text: props.route.params?.text ?? '',
 			room: props.route.params?.room ?? {},
-			thread: props.route.params?.thread ?? {},
+			thread: props.route.params?.thread ?? '',
 			maxFileSize: this.isShareExtension ? this.serverInfo?.FileUpload_MaxFileSize : props.FileUpload_MaxFileSize,
 			mediaAllowList: this.isShareExtension
 				? this.serverInfo?.FileUpload_MediaTypeWhiteList
@@ -257,7 +257,6 @@ class ShareView extends Component<IShareViewProps, IShareViewState> {
 							return sendFileMessage(
 								room.rid,
 								{
-									rid: room.rid,
 									name,
 									description,
 									size,
@@ -266,7 +265,7 @@ class ShareView extends Component<IShareViewProps, IShareViewState> {
 									store: 'Uploads',
 									msg
 								},
-								thread?.id,
+								(thread as TThreadModel)?.id || (thread as string),
 								server,
 								{ id: user.id, token: user.token }
 							);
@@ -277,7 +276,10 @@ class ShareView extends Component<IShareViewProps, IShareViewState> {
 
 				// Send text message
 			} else if (text.length) {
-				await sendMessage(room.rid, text, thread?.id, { id: user.id, token: user.token } as IUser);
+				await sendMessage(room.rid, text, (thread as TThreadModel)?.id || (thread as string), {
+					id: user.id,
+					token: user.token
+				} as IUser);
 			}
 		} catch {
 			if (!this.isShareExtension) {
@@ -345,14 +347,13 @@ class ShareView extends Component<IShareViewProps, IShareViewState> {
 					value={{
 						rid: room.rid,
 						t: room.t,
-						tmid: thread.id,
+						tmid: (thread as TThreadModel)?.id || (thread as string),
 						sharing: true,
 						action: route.params?.action,
 						selectedMessages,
 						onSendMessage: this.send,
 						onRemoveQuoteMessage: this.onRemoveQuoteMessage
-					}}
-				>
+					}}>
 					<View style={styles.container}>
 						<Preview
 							// using key just to reset zoom/move after change selected

e2e/tests/room/03-roomactions.spec.ts

@@ -194,7 +194,10 @@ describe('Room actions screen', () => {
 
 				// Pin the message
 				await pinMessage(messageToPin);
-
+				// verify pin icon
+				await waitFor(element(by.id(`${messageToPin}-pinned`)))
+					.toExist()
+					.withTimeout(6000);
 				// Back into Room Actions
 				await element(by.id('room-header')).tap();
 				await waitFor(element(by.id('room-actions-view')))
@@ -220,6 +223,10 @@ describe('Room actions screen', () => {
 				await waitFor(element(by[textMatcher](messageToPin).withAncestor(by.id('pinned-messages-view'))))
 					.not.toExist()
 					.withTimeout(6000);
+				// verify pin icon
+				await waitFor(element(by.id(`${messageToPin}-pinned`)))
+					.not.toExist()
+					.withTimeout(6000);
 				await backToActions();
 			});
 		});

ios/RocketChatRN.xcodeproj/project.pbxproj

@@ -2896,7 +2896,7 @@
 				INFOPLIST_FILE = NotificationService/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
-				MARKETING_VERSION = 4.48.0;
+				MARKETING_VERSION = 4.49.0;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_DEBUG";
@@ -2936,7 +2936,7 @@
 				INFOPLIST_FILE = NotificationService/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
-				MARKETING_VERSION = 4.48.0;
+				MARKETING_VERSION = 4.49.0;
 				MTL_FAST_MATH = YES;
 				OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE";
 				PRODUCT_BUNDLE_IDENTIFIER = chat.rocket.reactnative.NotificationService;

ios/RocketChatRN/Info.plist

@@ -26,7 +26,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.48.0</string>
+	<string>4.49.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>

ios/ShareRocketChatRN/Info.plist

@@ -26,7 +26,7 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.48.0</string>
+	<string>4.49.0</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>KeychainGroup</key>

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "rocket-chat-reactnative",
-	"version": "4.48.0",
+	"version": "4.49.0",
 	"private": true,
 	"scripts": {
 		"start": "react-native start",