@ethora/chat-component-rn 26.8.5 → 26.8.7

package/src/hooks/useSendMessage.tsx

@@ -15,6 +15,9 @@ import { RootState, store } from '../roomStore';
 import { getGlobalXmppClient } from '../utils/clientRegistry';
 import { useEventHandlers } from './useEventHandlers';
 import type { IConfig, IMessage } from '../types/types';
+import { canEditMessage, canSendMediaToRoom, canSendToRoom } from '../e2ee';
+import { shouldEncrypt } from '../e2ee/send';
+import type { SealedUpload } from '../e2ee/sealedFiles';
 
 // Watchdog: if a message stays "pending" (no server echo) for this
 // long after the optimistic dispatch, mark it failed so the bubble
@@ -79,7 +82,6 @@ export const useSendMessage = (_configOverride?: IConfig) => {
     (state: RootState) => state.chatSettingStore.langSource
   );
   const editAction = useSelector((state: RootState) => state.rooms.editAction);
-  const rooms = useSelector((state: RootState) => state.rooms.rooms);
 
   const {
     handleMessageSent,
@@ -88,10 +90,6 @@ export const useSendMessage = (_configOverride?: IConfig) => {
     handleMessageRetry,
   } = useEventHandlers(config);
 
-  const failedMessages = useSelector(
-    (state: RootState) => state.roomHeapSlice?.failedMessages || {}
-  );
-
   const sendMessage = useCallback(
     async (
       message: string,
@@ -108,6 +106,16 @@ export const useSendMessage = (_configOverride?: IConfig) => {
       existingId?: string
     ) => {
       if (editAction?.isEdit) {
+        const edited = reduxStore
+          .getState()
+          .rooms?.rooms?.[editAction.roomJid!]?.messages?.find(
+            (m: IMessage) => m.id === editAction.messageId
+          );
+        if (edited && !canEditMessage(edited)) {
+          console.warn('edit not sent: the message was encrypted');
+          dispatch(setEditAction({ isEdit: false }));
+          return;
+        }
         try {
           client?.editMessageStanza(
             editAction.roomJid!,
@@ -132,6 +140,11 @@ export const useSendMessage = (_configOverride?: IConfig) => {
         return;
       }
 
+      if (!canSendToRoom(activeRoomJID)) {
+        console.warn('message not sent: room is end-to-end encrypted');
+        return;
+      }
+
       // Critical-send hint to the QoS scheduler.
       client?.onCriticalSend?.(activeRoomJID);
 
@@ -162,6 +175,16 @@ export const useSendMessage = (_configOverride?: IConfig) => {
         // manual-mode readers see the Translate link on it too (parity with
         // the web SDK, which stamps langSource on the optimistic message).
         langSource: (langSource as any) || 'en',
+        // Reply fields as the wire carries them (strings), so a thread reply
+        // shows in its thread — and NOT in the channel — from the first
+        // frame, not only once the server echo lands.
+        ...(isReply
+          ? {
+              isReply: 'true',
+              showInChannel: isChecked ? 'true' : 'false',
+              mainMessage,
+            }
+          : {}),
         user: {
           ...(user as any),
           id: selfId,
@@ -350,6 +373,11 @@ export const useSendMessage = (_configOverride?: IConfig) => {
       mainMessage: string = '',
       existingId?: string
     ) => {
+      if (!canSendMediaToRoom(activeRoomJID)) {
+        console.warn('media not sent: room is end-to-end encrypted');
+        return;
+      }
+
       client?.onCriticalSend?.(activeRoomJID);
 
       // Defensive 50 MB guard on every send path (SendInput blocks it at
@@ -423,7 +451,7 @@ export const useSendMessage = (_configOverride?: IConfig) => {
               mimetype: type,
               originalName: data?.name,
               size: fileSizeStr,
-              isReply,
+              isReply: isReply ? 'true' : 'false',
               showInChannel: `${isChecked}`,
               mainMessage,
             } as any as IMessage,
@@ -504,20 +532,36 @@ export const useSendMessage = (_configOverride?: IConfig) => {
         name: data?.name || data?.fileName || `media_${Date.now()}`,
       };
 
+      let sealed: SealedUpload | undefined;
+
       const tryUpload = async () => {
+        if (shouldEncrypt(activeRoomJID) && !sealed) {
+          const { sealPickedFile } =
+            require('../e2ee/sealedFiles') as typeof import('../e2ee/sealedFiles');
+          sealed = await sealPickedFile({
+            uri: fileBlob.uri,
+            name: fileBlob.name,
+            type: fileBlob.type,
+            size: typeof data?.size === 'number' ? data.size : undefined,
+          });
+        }
+        const part = sealed
+          ? { uri: sealed.uri, type: 'application/octet-stream', name: sealed.name }
+          : fileBlob;
+        const options = { clientEncrypted: !!sealed };
         const fd = new FormData();
-        fd.append('files', fileBlob as any);
+        fd.append('files', part as any);
         try {
-          return await uploadFileV2(fd, activeRoomJID);
+          return await uploadFileV2(fd, activeRoomJID, options);
         } catch (err: any) {
           if (err?.response?.status === 500) {
             console.warn(
               'upload "files" field returned 500 — retrying with "file" (singular)',
-              { name: fileBlob.name, type: fileBlob.type }
+              { name: part.name, type: part.type }
             );
             const fd2 = new FormData();
-            fd2.append('file', fileBlob as any);
-            return await uploadFileV2(fd2, activeRoomJID);
+            fd2.append('file', part as any);
+            return await uploadFileV2(fd2, activeRoomJID, options);
           }
           throw err;
         }
@@ -557,7 +601,23 @@ export const useSendMessage = (_configOverride?: IConfig) => {
             mainMessage,
             isPrivate: item?.isPrivate,
             __v: item.__v,
+            e2eeKeys: sealed ? [sealed.keyMaterial] : undefined,
           };
+          if (sealed) {
+            try {
+              const { rememberOpened } =
+                require('../e2ee/sealedFiles') as typeof import('../e2ee/sealedFiles');
+              await rememberOpened(item.location, {
+                uri: fileBlob.uri,
+                name: fileBlob.name,
+                type: fileBlob.type,
+                size: typeof data?.size === 'number' ? data.size : undefined,
+              });
+            } catch (err) {
+              console.warn('could not keep the sent attachment', err);
+            }
+            sealed.dispose();
+          }
           // Stanza id == placeholder id so the MUC echo's outer
           // <message id="..."> matches xmppId on the placeholder and
           // insertMessageWithDelimiter merges in place + flips pending.
@@ -622,6 +682,7 @@ export const useSendMessage = (_configOverride?: IConfig) => {
         // Upload (or stanza send) threw an explicit error. Clear the
         // watchdog so it doesn't double-fire `markMessageFailed`.
         clearTimeout(mediaWatchdog);
+        sealed?.dispose();
         // Surface the real server payload so we can see why the upload
         // was rejected (axios collapses the message to "Request failed
         // with status code N"; the actual reason lives in
@@ -673,7 +734,8 @@ export const useSendMessage = (_configOverride?: IConfig) => {
   // it. No-op when the id isn't in the failed map.
   const retryMessage = useCallback(
     async (failedId: string) => {
-      const payload = failedMessages[failedId];
+      const payload =
+        reduxStore.getState().roomHeapSlice?.failedMessages?.[failedId];
       if (!payload) {return;}
 
       // The server may have accepted the original send even though its
@@ -681,7 +743,8 @@ export const useSendMessage = (_configOverride?: IConfig) => {
       // failed, but a confirmed (non-pending) copy is already sitting in
       // the room. Resending here would deliver a genuine duplicate; just
       // clear the failure and let the existing copy stand.
-      const roomMsgs = rooms?.[payload.roomJID]?.messages || [];
+      const roomMsgs =
+        reduxStore.getState().rooms?.rooms?.[payload.roomJID]?.messages || [];
       const alreadyDelivered = roomMsgs.some(
         (m: any) =>
           !m.pending && (m.id === failedId || m.xmppId === failedId)
@@ -720,7 +783,7 @@ export const useSendMessage = (_configOverride?: IConfig) => {
         );
       }
     },
-    [failedMessages, rooms, dispatch, handleMessageRetry, sendMessage, sendMedia]
+    [reduxStore, dispatch, handleMessageRetry, sendMessage, sendMedia]
   );
 
   // ChatRoom/ThreadWrapper consume this as the "edit branch" of send.
@@ -731,6 +794,16 @@ export const useSendMessage = (_configOverride?: IConfig) => {
       if (!editAction?.isEdit || !editAction.roomJid || !editAction.messageId) {
         return;
       }
+      const edited = reduxStore
+        .getState()
+        .rooms?.rooms?.[editAction.roomJid]?.messages?.find(
+          (m: IMessage) => m.id === editAction.messageId
+        );
+      if (edited && !canEditMessage(edited)) {
+        console.warn('edit not sent: the message was encrypted');
+        dispatch(setEditAction({ isEdit: false }));
+        return;
+      }
       try {
         client?.editMessageStanza(
           editAction.roomJid,
@@ -762,7 +835,7 @@ export const useSendMessage = (_configOverride?: IConfig) => {
   const isLastMessageFromUserAndProcessing = useCallback(
     (roomJID: string): boolean => {
       if (!roomJID) {return false;}
-      const msgs = rooms?.[roomJID]?.messages;
+      const msgs = reduxStore.getState().rooms?.rooms?.[roomJID]?.messages;
       if (!msgs || msgs.length === 0) {return false;}
       const last = msgs[msgs.length - 1];
       if (!last?.pending) {return false;}
@@ -770,7 +843,7 @@ export const useSendMessage = (_configOverride?: IConfig) => {
       if (!selfId) {return false;}
       return last.user?.id === selfId;
     },
-    [rooms, user?.xmppUsername, user?.walletAddress]
+    [reduxStore, user?.xmppUsername, user?.walletAddress]
   );
 
   return {

package/src/hooks/useUnreadMessagesCounter.ts

@@ -49,7 +49,7 @@ export const useUnreadMessagesCounter = (): UnreadMessagesStats => {
       unreadByRoom[roomJid] = unreadCount;
       totalCount += unreadCount;
     }
-    if ((room as any)?.unreadCapped) {
+    if ((room as any)?.unreadCapped && unreadCount >= 10) {
       isCapped = true;
     }
   });

package/src/i18n/strings.ts

@@ -25,6 +25,35 @@ const en: UiStringTable = {
   'date.yesterday': 'Yesterday',
   'message.deleted': 'Message deleted',
   'message.edited': 'edited',
+  'e2ee.roomEncrypted': 'End-to-end encrypted',
+  'e2ee.notEncrypted': 'Not encrypted',
+  'e2ee.notEncryptedHint': 'Sent without end-to-end encryption, because no recipient has published a key yet.',
+  'e2ee.devices.title': 'End-to-end encryption',
+  'e2ee.devices.thisDevice': 'This device',
+  'e2ee.devices.otherDevices': 'Other devices',
+  'e2ee.devices.none': 'Has not opened an encrypted chat yet',
+  'e2ee.devices.noneOwn': 'No other devices',
+  'e2ee.devices.unavailable': 'Encryption is not running on this device right now',
+  'e2ee.devices.loading': 'Loading devices…',
+  'e2ee.devices.hint': "Compare a fingerprint with the one shown on the other person's device. Mark it verified only if they match.",
+  'e2ee.trust.verified': 'Verified',
+  'e2ee.trust.blind': 'Not verified',
+  'e2ee.trust.untrusted': 'Not trusted',
+  'e2ee.trust.verify': 'Mark as verified',
+  'e2ee.trust.distrust': 'Stop trusting',
+  'e2ee.trust.reset': 'Clear the mark',
+  'e2ee.trust.prompt': 'Device {id}',
+  'e2ee.devices.copied': 'Fingerprint copied',
+  'e2ee.unsupportedMessage': "Encrypted message. This version of the app can't read it yet.",
+  'e2ee.otherDevice': 'Encrypted for another device',
+  'e2ee.undecryptable': 'Could not decrypt this message',
+  'e2ee.sendUnavailable': "This chat is end-to-end encrypted. Sending from the mobile app isn't available yet.",
+  'media.sealedFile': 'Encrypted file',
+  'media.sealedUnsupported': "Can't be opened in this version of the app yet",
+  'media.sealedUnavailable': 'Encrypted attachment could not be opened',
+  'media.sealedDownload': 'Download and decrypt',
+  'media.sealedDownloading': 'Decrypting…',
+  'media.sealedDownloadFailed': 'Download failed — tap to retry',
   'message.newMessages': 'New messages',
   'notification.senderFallback': 'New message',
   'presence.online': 'online',
@@ -169,6 +198,7 @@ const en: UiStringTable = {
   'field.referralCode': 'Your referral code',
   'action.logOut': 'Log Out',
   'action.message': 'Message',
+  'action.encryptedMessage': 'Encrypted message',
   'action.videoCall': 'Video call',
   'action.call': 'Call',
   'action.audioCall': 'Audio call',
@@ -283,6 +313,35 @@ const fr: UiStringTable = {
   'date.yesterday': 'Hier',
   'message.deleted': 'Message supprimé',
   'message.edited': 'modifié',
+  'e2ee.roomEncrypted': 'Chiffré de bout en bout',
+  'e2ee.notEncrypted': 'Non chiffré',
+  'e2ee.notEncryptedHint': "Envoyé sans chiffrement de bout en bout, car aucun destinataire n'a encore publié de clé.",
+  'e2ee.devices.title': 'Chiffrement de bout en bout',
+  'e2ee.devices.thisDevice': 'Cet appareil',
+  'e2ee.devices.otherDevices': 'Autres appareils',
+  'e2ee.devices.none': "N'a pas encore ouvert de discussion chiffrée",
+  'e2ee.devices.noneOwn': 'Aucun autre appareil',
+  'e2ee.devices.unavailable': "Le chiffrement n'est pas actif sur cet appareil pour le moment",
+  'e2ee.devices.loading': 'Chargement des appareils…',
+  'e2ee.devices.hint': "Comparez une empreinte avec celle affichée sur l'appareil de l'autre personne. Ne la marquez comme vérifiée que si elles correspondent.",
+  'e2ee.trust.verified': 'Vérifié',
+  'e2ee.trust.blind': 'Non vérifié',
+  'e2ee.trust.untrusted': 'Non fiable',
+  'e2ee.trust.verify': 'Marquer comme vérifié',
+  'e2ee.trust.distrust': 'Ne plus faire confiance',
+  'e2ee.trust.reset': 'Effacer la marque',
+  'e2ee.trust.prompt': 'Appareil {id}',
+  'e2ee.devices.copied': 'Empreinte copiée',
+  'e2ee.unsupportedMessage': "Message chiffré. Cette version de l'application ne peut pas encore le lire.",
+  'e2ee.otherDevice': 'Chiffré pour un autre appareil',
+  'e2ee.undecryptable': 'Impossible de déchiffrer ce message',
+  'e2ee.sendUnavailable': "Cette discussion est chiffrée de bout en bout. L'envoi depuis l'application mobile n'est pas encore disponible.",
+  'media.sealedFile': 'Fichier chiffré',
+  'media.sealedUnsupported': "Ne peut pas encore être ouvert dans cette version de l'application",
+  'media.sealedUnavailable': "La pièce jointe chiffrée n'a pas pu être ouverte",
+  'media.sealedDownload': 'Télécharger et déchiffrer',
+  'media.sealedDownloading': 'Déchiffrement…',
+  'media.sealedDownloadFailed': 'Échec du téléchargement — appuyez pour réessayer',
   'message.newMessages': 'Nouveaux messages',
   'notification.senderFallback': 'Nouveau message',
   'presence.online': 'en ligne',
@@ -427,6 +486,7 @@ const fr: UiStringTable = {
   'field.referralCode': 'Votre code de parrainage',
   'action.logOut': 'Déconnexion',
   'action.message': 'Message',
+  'action.encryptedMessage': 'Message chiffré',
   'action.videoCall': 'Appel vidéo',
   'action.call': 'Appeler',
   'action.audioCall': 'Appel audio',
@@ -541,6 +601,35 @@ const es: UiStringTable = {
   'date.yesterday': 'Ayer',
   'message.deleted': 'Mensaje eliminado',
   'message.edited': 'editado',
+  'e2ee.roomEncrypted': 'Cifrado de extremo a extremo',
+  'e2ee.notEncrypted': 'Sin cifrar',
+  'e2ee.notEncryptedHint': 'Enviado sin cifrado de extremo a extremo, porque ningún destinatario ha publicado una clave todavía.',
+  'e2ee.devices.title': 'Cifrado de extremo a extremo',
+  'e2ee.devices.thisDevice': 'Este dispositivo',
+  'e2ee.devices.otherDevices': 'Otros dispositivos',
+  'e2ee.devices.none': 'Aún no ha abierto un chat cifrado',
+  'e2ee.devices.noneOwn': 'No hay otros dispositivos',
+  'e2ee.devices.unavailable': 'El cifrado no está activo en este dispositivo en este momento',
+  'e2ee.devices.loading': 'Cargando dispositivos…',
+  'e2ee.devices.hint': 'Compara una huella con la que aparece en el dispositivo de la otra persona. Márcala como verificada solo si coinciden.',
+  'e2ee.trust.verified': 'Verificado',
+  'e2ee.trust.blind': 'Sin verificar',
+  'e2ee.trust.untrusted': 'No fiable',
+  'e2ee.trust.verify': 'Marcar como verificado',
+  'e2ee.trust.distrust': 'Dejar de confiar',
+  'e2ee.trust.reset': 'Quitar la marca',
+  'e2ee.trust.prompt': 'Dispositivo {id}',
+  'e2ee.devices.copied': 'Huella copiada',
+  'e2ee.unsupportedMessage': 'Mensaje cifrado. Esta versión de la aplicación aún no puede leerlo.',
+  'e2ee.otherDevice': 'Cifrado para otro dispositivo',
+  'e2ee.undecryptable': 'No se pudo descifrar este mensaje',
+  'e2ee.sendUnavailable': 'Este chat está cifrado de extremo a extremo. El envío desde la aplicación móvil aún no está disponible.',
+  'media.sealedFile': 'Archivo cifrado',
+  'media.sealedUnsupported': 'Aún no se puede abrir en esta versión de la aplicación',
+  'media.sealedUnavailable': 'No se pudo abrir el archivo adjunto cifrado',
+  'media.sealedDownload': 'Descargar y descifrar',
+  'media.sealedDownloading': 'Descifrando…',
+  'media.sealedDownloadFailed': 'Error de descarga: toca para reintentar',
   'message.newMessages': 'Nuevos mensajes',
   'notification.senderFallback': 'Nuevo mensaje',
   'presence.online': 'en línea',
@@ -685,6 +774,7 @@ const es: UiStringTable = {
   'field.referralCode': 'Tu código de referido',
   'action.logOut': 'Cerrar sesión',
   'action.message': 'Mensaje',
+  'action.encryptedMessage': 'Mensaje cifrado',
   'action.videoCall': 'Videollamada',
   'action.call': 'Llamar',
   'action.audioCall': 'Llamada de audio',
@@ -799,6 +889,35 @@ const pt: UiStringTable = {
   'date.yesterday': 'Ontem',
   'message.deleted': 'Mensagem eliminada',
   'message.edited': 'editado',
+  'e2ee.roomEncrypted': 'Criptografado de ponta a ponta',
+  'e2ee.notEncrypted': 'Sem criptografia',
+  'e2ee.notEncryptedHint': 'Enviado sem criptografia de ponta a ponta, porque nenhum destinatário publicou uma chave ainda.',
+  'e2ee.devices.title': 'Criptografia de ponta a ponta',
+  'e2ee.devices.thisDevice': 'Este dispositivo',
+  'e2ee.devices.otherDevices': 'Outros dispositivos',
+  'e2ee.devices.none': 'Ainda não abriu uma conversa criptografada',
+  'e2ee.devices.noneOwn': 'Nenhum outro dispositivo',
+  'e2ee.devices.unavailable': 'A criptografia não está ativa neste dispositivo no momento',
+  'e2ee.devices.loading': 'Carregando dispositivos…',
+  'e2ee.devices.hint': 'Compare uma impressão digital com a exibida no dispositivo da outra pessoa. Marque como verificada somente se coincidirem.',
+  'e2ee.trust.verified': 'Verificado',
+  'e2ee.trust.blind': 'Não verificado',
+  'e2ee.trust.untrusted': 'Não confiável',
+  'e2ee.trust.verify': 'Marcar como verificado',
+  'e2ee.trust.distrust': 'Deixar de confiar',
+  'e2ee.trust.reset': 'Remover a marca',
+  'e2ee.trust.prompt': 'Dispositivo {id}',
+  'e2ee.devices.copied': 'Impressão digital copiada',
+  'e2ee.unsupportedMessage': 'Mensagem criptografada. Esta versão do aplicativo ainda não consegue lê-la.',
+  'e2ee.otherDevice': 'Criptografado para outro dispositivo',
+  'e2ee.undecryptable': 'Não foi possível descriptografar esta mensagem',
+  'e2ee.sendUnavailable': 'Esta conversa é criptografada de ponta a ponta. O envio pelo aplicativo móvel ainda não está disponível.',
+  'media.sealedFile': 'Arquivo criptografado',
+  'media.sealedUnsupported': 'Ainda não pode ser aberto nesta versão do aplicativo',
+  'media.sealedUnavailable': 'Não foi possível abrir o anexo criptografado',
+  'media.sealedDownload': 'Baixar e descriptografar',
+  'media.sealedDownloading': 'Descriptografando…',
+  'media.sealedDownloadFailed': 'Falha no download — toque para tentar novamente',
   'message.newMessages': 'Novas mensagens',
   'notification.senderFallback': 'Nova mensagem',
   'presence.online': 'online',
@@ -943,6 +1062,7 @@ const pt: UiStringTable = {
   'field.referralCode': 'O seu código de referência',
   'action.logOut': 'Terminar sessão',
   'action.message': 'Mensagem',
+  'action.encryptedMessage': 'Mensagem criptografada',
   'action.videoCall': 'Videochamada',
   'action.call': 'Ligar',
   'action.audioCall': 'Chamada de áudio',
@@ -1057,6 +1177,35 @@ const ht: UiStringTable = {
   'date.yesterday': 'Yè',
   'message.deleted': 'Mesaj efase',
   'message.edited': 'modifye',
+  'e2ee.roomEncrypted': 'Chifre bout-a-bout',
+  'e2ee.notEncrypted': 'Pa chifre',
+  'e2ee.notEncryptedHint': 'Voye san chifraj bout-a-bout, paske okenn moun ki resevwa a poko pibliye yon kle.',
+  'e2ee.devices.title': 'Chifraj bout-a-bout',
+  'e2ee.devices.thisDevice': 'Aparèy sa a',
+  'e2ee.devices.otherDevices': 'Lòt aparèy',
+  'e2ee.devices.none': 'Poko louvri yon chat chifre',
+  'e2ee.devices.noneOwn': 'Pa gen lòt aparèy',
+  'e2ee.devices.unavailable': 'Chifraj la pa aktif sou aparèy sa a kounye a',
+  'e2ee.devices.loading': 'Ap chaje aparèy yo…',
+  'e2ee.devices.hint': 'Konpare yon anprent ak sa ki parèt sou aparèy lòt moun nan. Make li kòm verifye sèlman si yo menm.',
+  'e2ee.trust.verified': 'Verifye',
+  'e2ee.trust.blind': 'Pa verifye',
+  'e2ee.trust.untrusted': 'Pa fè konfyans',
+  'e2ee.trust.verify': 'Make kòm verifye',
+  'e2ee.trust.distrust': 'Sispann fè konfyans',
+  'e2ee.trust.reset': 'Retire mak la',
+  'e2ee.trust.prompt': 'Aparèy {id}',
+  'e2ee.devices.copied': 'Anprent kopye',
+  'e2ee.unsupportedMessage': 'Mesaj chifre. Vèsyon aplikasyon sa a poko ka li li.',
+  'e2ee.otherDevice': 'Chifre pou yon lòt aparèy',
+  'e2ee.undecryptable': 'Nou pa t kapab dechifre mesaj sa a',
+  'e2ee.sendUnavailable': 'Chat sa a chifre bout-a-bout. Voye mesaj depi aplikasyon mobil la poko disponib.',
+  'media.sealedFile': 'Fichye chifre',
+  'media.sealedUnsupported': 'Poko ka louvri nan vèsyon aplikasyon sa a',
+  'media.sealedUnavailable': 'Nou pa t kapab louvri atachman chifre a',
+  'media.sealedDownload': 'Telechaje epi dechifre',
+  'media.sealedDownloading': 'Ap dechifre…',
+  'media.sealedDownloadFailed': 'Telechajman echwe — peze pou reeseye',
   'message.newMessages': 'Nouvo mesaj yo',
   'notification.senderFallback': 'Nouvo mesaj',
   'presence.online': 'an liy',
@@ -1201,6 +1350,7 @@ const ht: UiStringTable = {
   'field.referralCode': 'Kòd referans ou',
   'action.logOut': 'Dekonekte',
   'action.message': 'Mesaj',
+  'action.encryptedMessage': 'Mesaj chifre',
   'action.videoCall': 'Apèl videyo',
   'action.call': 'Rele',
   'action.audioCall': 'Apèl odyo',
@@ -1315,6 +1465,35 @@ const zh: UiStringTable = {
   'date.yesterday': '昨天',
   'message.deleted': '消息已删除',
   'message.edited': '已编辑',
+  'e2ee.roomEncrypted': '端到端加密',
+  'e2ee.notEncrypted': '未加密',
+  'e2ee.notEncryptedHint': '未使用端到端加密发送，因为还没有收件人发布密钥。',
+  'e2ee.devices.title': '端到端加密',
+  'e2ee.devices.thisDevice': '此设备',
+  'e2ee.devices.otherDevices': '其他设备',
+  'e2ee.devices.none': '尚未打开过加密聊天',
+  'e2ee.devices.noneOwn': '没有其他设备',
+  'e2ee.devices.unavailable': '此设备上的加密当前未运行',
+  'e2ee.devices.loading': '正在加载设备…',
+  'e2ee.devices.hint': '将指纹与对方设备上显示的指纹进行比较。仅在两者一致时才标记为已验证。',
+  'e2ee.trust.verified': '已验证',
+  'e2ee.trust.blind': '未验证',
+  'e2ee.trust.untrusted': '不受信任',
+  'e2ee.trust.verify': '标记为已验证',
+  'e2ee.trust.distrust': '停止信任',
+  'e2ee.trust.reset': '清除标记',
+  'e2ee.trust.prompt': '设备 {id}',
+  'e2ee.devices.copied': '指纹已复制',
+  'e2ee.unsupportedMessage': '加密消息。此版本的应用暂时无法读取。',
+  'e2ee.otherDevice': '已为其他设备加密',
+  'e2ee.undecryptable': '无法解密此消息',
+  'e2ee.sendUnavailable': '此聊天已启用端到端加密，暂不支持从移动应用发送消息。',
+  'media.sealedFile': '加密文件',
+  'media.sealedUnsupported': '此版本的应用暂时无法打开',
+  'media.sealedUnavailable': '无法打开加密附件',
+  'media.sealedDownload': '下载并解密',
+  'media.sealedDownloading': '正在解密…',
+  'media.sealedDownloadFailed': '下载失败 — 点击重试',
   'message.newMessages': '新消息',
   'notification.senderFallback': '新消息',
   'presence.online': '在线',
@@ -1459,6 +1638,7 @@ const zh: UiStringTable = {
   'field.referralCode': '您的推荐码',
   'action.logOut': '退出登录',
   'action.message': '发消息',
+  'action.encryptedMessage': '加密消息',
   'action.videoCall': '视频通话',
   'action.call': '通话',
   'action.audioCall': '语音通话',

package/src/main.ts

@@ -123,3 +123,5 @@ export {
 export type { ChatTheme, ChatThemeColors, ChatThemeOverrides } from './theme';
 export type { ThemePreference } from './theme/theme';
 export { setThemePreference, setPushEnabled } from './roomStore/chatSettingsSlice';
+export { omemo, isE2eeEnabled } from './e2ee';
+export type { DeviceInfo, Trust } from './e2ee';

package/src/networking/api-requests/auth.api.ts

@@ -266,10 +266,18 @@ const canFallBackToLegacyUpload = (error: unknown): boolean => {
 
 let secureUploadUnavailable = false;
 
+export interface UploadFileOptions {
+  clientEncrypted?: boolean;
+}
+
 export async function uploadFileV2(
   formData: FormData,
-  activeRoomJID: string
+  activeRoomJID: string,
+  options: UploadFileOptions = {}
 ): Promise<{ data: any }> {
+  if (options.clientEncrypted) {
+    formData.append('clientEncrypted', 'true');
+  }
   const chatName = (activeRoomJID || '').split('@')[0];
   const apiRoot = getCurrentBaseURL().replace(/\/$/, '');