@ethora/chat-component-rn 26.8.6 → 26.8.8

package/lib/module/e2ee/stanza.js

@@ -0,0 +1,107 @@
+"use strict";
+
+import { Element, parse } from 'ltx';
+import { store } from '../roomStore';
+import { translateKey } from '../i18n/strings';
+import { NS_OMEMO } from './ns';
+import { omemoReady, senderJidFromMuc } from './index';
+const READY_TIMEOUT_MS = 8000;
+export function encryptedCarrier(stanza, depth = 0) {
+  if (depth > 4 || !stanza?.getChild) {
+    return undefined;
+  }
+  if (stanza.name === 'message' && stanza.getChild('encrypted', NS_OMEMO)) {
+    return stanza;
+  }
+  for (const child of stanza.children ?? []) {
+    if (typeof child === 'string') {
+      continue;
+    }
+    const found = encryptedCarrier(child, depth + 1);
+    if (found) {
+      return found;
+    }
+  }
+  return undefined;
+}
+const PLACEHOLDER_KEY = {
+  unsupported: 'e2ee.unsupportedMessage',
+  'other-device': 'e2ee.otherDevice',
+  failed: 'e2ee.undecryptable'
+};
+export function placeholderKey(error) {
+  return PLACEHOLDER_KEY[error] ?? PLACEHOLDER_KEY.failed;
+}
+function placeholder(error) {
+  const settings = store.getState()?.chatSettingStore;
+  return new Element('body', {}).t(translateKey(placeholderKey(error), settings?.uiLocale || settings?.config?.i18n?.locale || settings?.langSource, settings?.config?.i18n?.strings));
+}
+function mark(carrier, error) {
+  let data = carrier.getChild('data');
+  if (!data) {
+    data = new Element('data', {});
+    carrier.append(data);
+  }
+  data.attrs.omemoEncrypted = 'true';
+  if (error) {
+    data.attrs.undecryptable = 'true';
+    data.attrs.e2eeError = error;
+  }
+}
+function strip(carrier) {
+  carrier.remove('encrypted', NS_OMEMO);
+  carrier.remove('encryption', 'urn:xmpp:eme:0');
+  carrier.remove('body');
+}
+function close(carrier, error) {
+  strip(carrier);
+  carrier.append(placeholder(error));
+  mark(carrier, error);
+  return 'undecryptable';
+}
+export function rewriteEncryptedStanza(stanza) {
+  const carrier = encryptedCarrier(stanza);
+  if (!carrier) {
+    return 'not-encrypted';
+  }
+  const encrypted = carrier.getChild('encrypted', NS_OMEMO);
+  if (!encrypted?.getChild('payload')) {
+    return 'drop';
+  }
+  return close(carrier, 'unsupported');
+}
+const waitForDevice = () => {
+  let timer;
+  const timeout = new Promise(resolve => {
+    timer = setTimeout(() => resolve(undefined), READY_TIMEOUT_MS);
+  });
+  return Promise.race([omemoReady(), timeout]).finally(() => {
+    if (timer) {
+      clearTimeout(timer);
+    }
+  });
+};
+export async function decryptStanzaInPlace(stanza, domain) {
+  const carrier = encryptedCarrier(stanza);
+  if (!carrier) {
+    return 'not-encrypted';
+  }
+  const encrypted = carrier.getChild('encrypted', NS_OMEMO);
+  if (!encrypted?.getChild('payload')) {
+    return 'drop';
+  }
+  const from = String(carrier.attrs?.from || '');
+  const roomJid = from.split('/')[0];
+  const sender = senderJidFromMuc(from, domain);
+  const crypto = await waitForDevice();
+  const decrypted = sender ? await crypto?.decrypt(carrier, sender, roomJid) : undefined;
+  if (!decrypted?.content) {
+    return close(carrier, decrypted?.error === 'omemo_not_encrypted_for_this_device' ? 'other-device' : 'failed');
+  }
+  strip(carrier);
+  const wrapper = parse(`<omemo-content>${decrypted.content}</omemo-content>`);
+  carrier.append(...wrapper.children);
+  mark(carrier);
+  return 'decrypted';
+}
+//# sourceMappingURL=stanza.js.map

package/lib/module/e2ee/stanza.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["Element","parse","store","translateKey","NS_OMEMO","omemoReady","senderJidFromMuc","READY_TIMEOUT_MS","encryptedCarrier","stanza","depth","getChild","undefined","name","child","children","found","PLACEHOLDER_KEY","unsupported","failed","placeholderKey","error","placeholder","settings","getState","chatSettingStore","t","uiLocale","config","i18n","locale","langSource","strings","mark","carrier","data","append","attrs","omemoEncrypted","undecryptable","e2eeError","strip","remove","close","rewriteEncryptedStanza","encrypted","waitForDevice","timer","timeout","Promise","resolve","setTimeout","race","finally","clearTimeout","decryptStanzaInPlace","domain","from","String","roomJid","split","sender","crypto","decrypted","decrypt","content","wrapper"],"sourceRoot":"../../../src","sources":["e2ee/stanza.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/e2ee/store.js

@@ -0,0 +1,35 @@
+"use strict";
+
+import { fromBase64, toBase64 } from './crypto';
+const BYTES_TAG = '$bytes';
+export function encodeValue(value) {
+  return JSON.stringify(value, (_key, item) => item instanceof Uint8Array ? {
+    [BYTES_TAG]: toBase64(item)
+  } : item);
+}
+export function decodeValue(text) {
+  return JSON.parse(text, (_key, item) => item && typeof item === 'object' && typeof item[BYTES_TAG] === 'string' ? fromBase64(item[BYTES_TAG]) : item);
+}
+export function createStore(backend, jid) {
+  const prefix = `${jid.toLowerCase()}|`;
+  return {
+    get: async key => {
+      const raw = await backend.getItem(prefix + key);
+      return raw === null ? undefined : decodeValue(raw);
+    },
+    set: (key, value) => backend.setItem(prefix + key, encodeValue(value)),
+    delete: key => backend.removeItem(prefix + key)
+  };
+}
+export function createMemoryBackend() {
+  const data = new Map();
+  return {
+    getItem: async key => data.get(key) ?? null,
+    setItem: async (key, value) => void data.set(key, value),
+    removeItem: async key => void data.delete(key)
+  };
+}
+export function createMemoryStore(jid = 'memory') {
+  return createStore(createMemoryBackend(), jid);
+}
+//# sourceMappingURL=store.js.map

package/lib/module/e2ee/store.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["fromBase64","toBase64","BYTES_TAG","encodeValue","value","JSON","stringify","_key","item","Uint8Array","decodeValue","text","parse","createStore","backend","jid","prefix","toLowerCase","get","key","raw","getItem","undefined","set","setItem","delete","removeItem","createMemoryBackend","data","Map","createMemoryStore"],"sourceRoot":"../../../src","sources":["e2ee/store.ts"],"mappings":";;AAAA,SAASA,UAAU,EAAEC,QAAQ,QAAQ,UAAU;AAQ/C,MAAMC,SAAS,GAAG,QAAQ;AAE1B,OAAO,SAASC,WAAWA,CAACC,KAAc,EAAU;EAClD,OAAOC,IAAI,CAACC,SAAS,CAACF,KAAK,EAAE,CAACG,IAAI,EAAEC,IAAI,KACtCA,IAAI,YAAYC,UAAU,GAAG;IAAE,CAACP,SAAS,GAAGD,QAAQ,CAACO,IAAI;EAAE,CAAC,GAAGA,IACjE,CAAC;AACH;AAEA,OAAO,SAASE,WAAWA,CAAIC,IAAY,EAAK;EAC9C,OAAON,IAAI,CAACO,KAAK,CAACD,IAAI,EAAE,CAACJ,IAAI,EAAEC,IAAI,KACjCA,IAAI,IAAI,OAAOA,IAAI,KAAK,QAAQ,IAAI,OAAOA,IAAI,CAACN,SAAS,CAAC,KAAK,QAAQ,GACnEF,UAAU,CAACQ,IAAI,CAACN,SAAS,CAAC,CAAC,GAC3BM,IACN,CAAC;AACH;AAQA,OAAO,SAASK,WAAWA,CAACC,OAAsB,EAAEC,GAAW,EAAc;EAC3E,MAAMC,MAAM,GAAG,GAAGD,GAAG,CAACE,WAAW,CAAC,CAAC,GAAG;EACtC,OAAO;IACLC,GAAG,EAAE,MAAUC,GAAW,IAAK;MAC7B,MAAMC,GAAG,GAAG,MAAMN,OAAO,CAACO,OAAO,CAACL,MAAM,GAAGG,GAAG,CAAC;MAC/C,OAAOC,GAAG,KAAK,IAAI,GAAGE,SAAS,GAAGZ,WAAW,CAAIU,GAAG,CAAC;IACvD,CAAC;IACDG,GAAG,EAAEA,CAACJ,GAAG,EAAEf,KAAK,KAAKU,OAAO,CAACU,OAAO,CAACR,MAAM,GAAGG,GAAG,EAAEhB,WAAW,CAACC,KAAK,CAAC,CAAC;IACtEqB,MAAM,EAAGN,GAAG,IAAKL,OAAO,CAACY,UAAU,CAACV,MAAM,GAAGG,GAAG;EAClD,CAAC;AACH;AAEA,OAAO,SAASQ,mBAAmBA,CAAA,EAAkB;EACnD,MAAMC,IAAI,GAAG,IAAIC,GAAG,CAAiB,CAAC;EACtC,OAAO;IACLR,OAAO,EAAE,MAAOF,GAAG,IAAKS,IAAI,CAACV,GAAG,CAACC,GAAG,CAAC,IAAI,IAAI;IAC7CK,OAAO,EAAE,MAAAA,CAAOL,GAAG,EAAEf,KAAK,KAAK,KAAKwB,IAAI,CAACL,GAAG,CAACJ,GAAG,EAAEf,KAAK,CAAC;IACxDsB,UAAU,EAAE,MAAOP,GAAG,IAAK,KAAKS,IAAI,CAACH,MAAM,CAACN,GAAG;EACjD,CAAC;AACH;AAEA,OAAO,SAASW,iBAAiBA,CAACf,GAAG,GAAG,QAAQ,EAAc;EAC5D,OAAOF,WAAW,CAACc,mBAAmB,CAAC,CAAC,EAAEZ,GAAG,CAAC;AAChD","ignoreList":[]}

package/lib/module/helpers/accountName.js

@@ -0,0 +1,18 @@
+"use strict";
+
+export const accountNameOf = (user, appId) => {
+  for (const raw of [user?.xmppUsername, user?.userJID, user?.id, user?._id]) {
+    const value = String(raw || '').split('@')[0].trim();
+    if (!value) {
+      continue;
+    }
+    if (value.includes('_')) {
+      return value;
+    }
+    if (appId) {
+      return `${appId}_${value}`;
+    }
+  }
+  return '';
+};
+//# sourceMappingURL=accountName.js.map

package/lib/module/helpers/accountName.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["accountNameOf","user","appId","raw","xmppUsername","userJID","id","_id","value","String","split","trim","includes"],"sourceRoot":"../../../src","sources":["helpers/accountName.ts"],"mappings":";;AAAA,OAAO,MAAMA,aAAa,GAAGA,CAC3BC,IAGa,EACbC,KAAa,KACF;EACX,KAAK,MAAMC,GAAG,IAAI,CAACF,IAAI,EAAEG,YAAY,EAAEH,IAAI,EAAEI,OAAO,EAAEJ,IAAI,EAAEK,EAAE,EAAEL,IAAI,EAAEM,GAAG,CAAC,EAAE;IAC1E,MAAMC,KAAK,GAAGC,MAAM,CAACN,GAAG,IAAI,EAAE,CAAC,CAACO,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAEC,IAAI,CAAC,CAAC;IACrD,IAAI,CAACH,KAAK,EAAE;MAAC;IAAS;IACtB,IAAIA,KAAK,CAACI,QAAQ,CAAC,GAAG,CAAC,EAAE;MAAC,OAAOJ,KAAK;IAAC;IACvC,IAAIN,KAAK,EAAE;MAAC,OAAO,GAAGA,KAAK,IAAIM,KAAK,EAAE;IAAC;EACzC;EACA,OAAO,EAAE;AACX,CAAC","ignoreList":[]}

package/lib/module/helpers/constants/MODAL_COMPONENTS.js

@@ -15,6 +15,7 @@ import ManageDataModal from '../../components/Modals/SettingsModals/ManageDataMo
 import ProfileSharesModal from '../../components/Modals/SettingsModals/ProfileShares/ProfileShares';
 import ReferralsModal from '../../components/Modals/SettingsModals/Referrals/Referrals';
 import VisibilityModal from '../../components/Modals/SettingsModals/Visibility/VisibilityModal';
+import ChangePasswordModal from '../../components/Modals/SettingsModals/ChangePassword/ChangePasswordModal';
 import UserProfileModal from '../../components/Modals/UserProfileModal/UserProfileModal';
 import UserSettingsModal from '../../components/Modals/UserSettingsModal/UserSettingsModal';
 export const MODAL_COMPONENTS = {
@@ -24,6 +25,7 @@ export const MODAL_COMPONENTS = {
   [MODAL_TYPES.CHAT_PROFILE]: ChatProfileModal,
   [MODAL_TYPES.MANAGE_DATA]: ManageDataModal,
   [MODAL_TYPES.VISIBILITY]: VisibilityModal,
+  [MODAL_TYPES.CHANGE_PASSWORD]: ChangePasswordModal,
   [MODAL_TYPES.REFERRALS]: ReferralsModal,
   [MODAL_TYPES.DOCUMENT_SHARES]: DocumentSharesModal,
   [MODAL_TYPES.PROFILE_SHARES]: ProfileSharesModal,

package/lib/module/helpers/constants/MODAL_COMPONENTS.js.map

@@ -1 +1 @@
-{"version":3,"names":["MODAL_TYPES","ChatProfileModal","FilePreviewModal","NewChatModal","BlockedUsersModal","DocumentSharesModal","ManageDataModal","ProfileSharesModal","ReferralsModal","VisibilityModal","UserProfileModal","UserSettingsModal","MODAL_COMPONENTS","SETTINGS","NEW_CHAT","PROFILE","CHAT_PROFILE","MANAGE_DATA","VISIBILITY","REFERRALS","DOCUMENT_SHARES","PROFILE_SHARES","BLOCKED_USERS","FILE_PREVIEW"],"sourceRoot":"../../../../src","sources":["helpers/constants/MODAL_COMPONENTS.tsx"],"mappings":";;AAAA;AACA;AACA;AACA;;AAGA,SAASA,WAAW,QAAQ,eAAe;AAC3C,OAAOC,gBAAgB,MAAM,2DAA2D;AACxF,OAAOC,gBAAgB,MAAM,2DAA2D;AACxF,OAAOC,YAAY,MAAM,mDAAmD;AAC5E,OAAOC,iBAAiB,MAAM,uEAAuE;AACrG,OAAOC,mBAAmB,MAAM,2EAA2E;AAC3G,OAAOC,eAAe,MAAM,wEAAwE;AACpG,OAAOC,kBAAkB,MAAM,oEAAoE;AACnG,OAAOC,cAAc,MAAM,4DAA4D;AACvF,OAAOC,eAAe,MAAM,mEAAmE;AAC/F,OAAOC,gBAAgB,MAAM,2DAA2D;AACxF,OAAOC,iBAAiB,MAAM,6DAA6D;AAE3F,OAAO,MAAMC,gBAGZ,GAAG;EACF,CAACZ,WAAW,CAACa,QAAQ,GAAGF,iBAAiB;EACzC,CAACX,WAAW,CAACc,QAAQ,GAAGX,YAAY;EACpC,CAACH,WAAW,CAACe,OAAO,GAAGL,gBAAgB;EACvC,CAACV,WAAW,CAACgB,YAAY,GAAGf,gBAAgB;EAC5C,CAACD,WAAW,CAACiB,WAAW,GAAGX,eAAe;EAC1C,CAACN,WAAW,CAACkB,UAAU,GAAGT,eAAe;EACzC,CAACT,WAAW,CAACmB,SAAS,GAAGX,cAAc;EACvC,CAACR,WAAW,CAACoB,eAAe,GAAGf,mBAAmB;EAClD,CAACL,WAAW,CAACqB,cAAc,GAAGd,kBAAkB;EAChD,CAACP,WAAW,CAACsB,aAAa,GAAGlB,iBAAiB;EAC9C,CAACJ,WAAW,CAACuB,YAAY,GAAGrB;AAC9B,CAAC","ignoreList":[]}
+{"version":3,"names":["MODAL_TYPES","ChatProfileModal","FilePreviewModal","NewChatModal","BlockedUsersModal","DocumentSharesModal","ManageDataModal","ProfileSharesModal","ReferralsModal","VisibilityModal","ChangePasswordModal","UserProfileModal","UserSettingsModal","MODAL_COMPONENTS","SETTINGS","NEW_CHAT","PROFILE","CHAT_PROFILE","MANAGE_DATA","VISIBILITY","CHANGE_PASSWORD","REFERRALS","DOCUMENT_SHARES","PROFILE_SHARES","BLOCKED_USERS","FILE_PREVIEW"],"sourceRoot":"../../../../src","sources":["helpers/constants/MODAL_COMPONENTS.tsx"],"mappings":";;AAAA;AACA;AACA;AACA;;AAGA,SAASA,WAAW,QAAQ,eAAe;AAC3C,OAAOC,gBAAgB,MAAM,2DAA2D;AACxF,OAAOC,gBAAgB,MAAM,2DAA2D;AACxF,OAAOC,YAAY,MAAM,mDAAmD;AAC5E,OAAOC,iBAAiB,MAAM,uEAAuE;AACrG,OAAOC,mBAAmB,MAAM,2EAA2E;AAC3G,OAAOC,eAAe,MAAM,wEAAwE;AACpG,OAAOC,kBAAkB,MAAM,oEAAoE;AACnG,OAAOC,cAAc,MAAM,4DAA4D;AACvF,OAAOC,eAAe,MAAM,mEAAmE;AAC/F,OAAOC,mBAAmB,MAAM,2EAA2E;AAC3G,OAAOC,gBAAgB,MAAM,2DAA2D;AACxF,OAAOC,iBAAiB,MAAM,6DAA6D;AAE3F,OAAO,MAAMC,gBAGZ,GAAG;EACF,CAACb,WAAW,CAACc,QAAQ,GAAGF,iBAAiB;EACzC,CAACZ,WAAW,CAACe,QAAQ,GAAGZ,YAAY;EACpC,CAACH,WAAW,CAACgB,OAAO,GAAGL,gBAAgB;EACvC,CAACX,WAAW,CAACiB,YAAY,GAAGhB,gBAAgB;EAC5C,CAACD,WAAW,CAACkB,WAAW,GAAGZ,eAAe;EAC1C,CAACN,WAAW,CAACmB,UAAU,GAAGV,eAAe;EACzC,CAACT,WAAW,CAACoB,eAAe,GAAGV,mBAAmB;EAClD,CAACV,WAAW,CAACqB,SAAS,GAAGb,cAAc;EACvC,CAACR,WAAW,CAACsB,eAAe,GAAGjB,mBAAmB;EAClD,CAACL,WAAW,CAACuB,cAAc,GAAGhB,kBAAkB;EAChD,CAACP,WAAW,CAACwB,aAAa,GAAGpB,iBAAiB;EAC9C,CAACJ,WAAW,CAACyB,YAAY,GAAGvB;AAC9B,CAAC","ignoreList":[]}

package/lib/module/helpers/constants/MODAL_TYPES.js

@@ -17,6 +17,7 @@ export const MODAL_TYPES = {
   CHAT_PROFILE: 'chatprofile',
   MANAGE_DATA: 'managedata',
   VISIBILITY: 'visibility',
+  CHANGE_PASSWORD: 'change_password',
   PROFILE_SHARES: 'profile_shares',
   DOCUMENT_SHARES: 'document_shares',
   BLOCKED_USERS: 'blocked_users',

package/lib/module/helpers/constants/MODAL_TYPES.js.map

@@ -1 +1 @@
-{"version":3,"names":["MODAL_TYPES","SETTINGS","PROFILE","CHAT_PROFILE","MANAGE_DATA","VISIBILITY","PROFILE_SHARES","DOCUMENT_SHARES","BLOCKED_USERS","REFERRALS","FILE_PREVIEW","NEW_CHAT"],"sourceRoot":"../../../../src","sources":["helpers/constants/MODAL_TYPES.ts"],"mappings":";;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA,OAAO,MAAMA,WAAW,GAAG;EACzBC,QAAQ,EAAE,UAAU;EACpBC,OAAO,EAAE,SAAS;EAClBC,YAAY,EAAE,aAAa;EAC3BC,WAAW,EAAE,YAAY;EACzBC,UAAU,EAAE,YAAY;EAExBC,cAAc,EAAE,gBAAgB;EAChCC,eAAe,EAAE,iBAAiB;EAClCC,aAAa,EAAE,eAAe;EAE9BC,SAAS,EAAE,WAAW;EAEtBC,YAAY,EAAE,cAAc;EAE5BC,QAAQ,EAAE;AACZ,CAAC","ignoreList":[]}
+{"version":3,"names":["MODAL_TYPES","SETTINGS","PROFILE","CHAT_PROFILE","MANAGE_DATA","VISIBILITY","CHANGE_PASSWORD","PROFILE_SHARES","DOCUMENT_SHARES","BLOCKED_USERS","REFERRALS","FILE_PREVIEW","NEW_CHAT"],"sourceRoot":"../../../../src","sources":["helpers/constants/MODAL_TYPES.ts"],"mappings":";;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA,OAAO,MAAMA,WAAW,GAAG;EACzBC,QAAQ,EAAE,UAAU;EACpBC,OAAO,EAAE,SAAS;EAClBC,YAAY,EAAE,aAAa;EAC3BC,WAAW,EAAE,YAAY;EACzBC,UAAU,EAAE,YAAY;EACxBC,eAAe,EAAE,iBAAiB;EAElCC,cAAc,EAAE,gBAAgB;EAChCC,eAAe,EAAE,iBAAiB;EAClCC,aAAa,EAAE,eAAe;EAE9BC,SAAS,EAAE,WAAW;EAEtBC,YAAY,EAAE,cAAc;EAE5BC,QAAQ,EAAE;AACZ,CAAC","ignoreList":[]}

package/lib/module/helpers/createMessageFromXml.js

@@ -1,5 +1,8 @@
 "use strict";
 
+import { isE2eeRoom } from '../e2ee';
+import { composeName } from './displayName';
+import { parseSealedMediaBody } from '../e2ee/sealedBody';
 /**
  * Build an IMessage from XML.
  *
@@ -77,11 +80,14 @@ export const createMessageFromXml = async (arg, bodyEl, positionalId, positional
   // Synthesize user.name from sender attrs (web reads usersSet from
   // redux in <Message>; we fix it once at the source so Avatar /
   // MessageHeader render the actual sender instead of "??").
-  const firstName = (merged.senderFirstName || '').toString().trim();
-  const lastName = (merged.senderLastName || '').toString().trim();
+  const firstName = (merged.senderFirstName || merged.firstName || '').toString().trim();
+  const lastName = (merged.senderLastName || merged.lastName || '').toString().trim();
   const fullName = (merged.fullName || '').toString().trim();
   const senderJID = (merged.senderJID || '').toString();
-  const senderLocal = senderJID.includes('@') ? senderJID.split('@')[0] : senderJID;
+  const senderBare = senderJID.split('/')[0] || '';
+  const senderResource = senderJID.includes('/') ? senderJID.split('/')[1] || '' : '';
+  const senderIsOccupant = !!senderResource && (senderBare === String(merged.roomJid || '') || /@conference\./i.test(senderBare));
+  const senderLocal = senderIsOccupant ? senderResource : senderBare.includes('@') ? senderBare.split('@')[0] : senderBare;
 
   // Bug #41 root cause: the resource of the MUC `from` (room@conference/
   // occupant-id) is the SAME field getDataFromXml uses to derive
@@ -100,11 +106,20 @@ export const createMessageFromXml = async (arg, bodyEl, positionalId, positional
   // the "official" fetch lands.
   const xmppFrom = (merged.xmppFrom || '').toString();
   const fromResource = xmppFrom.includes('/') ? xmppFrom.split('/')[1] : '';
-  const composed = [firstName, lastName].filter(Boolean).join(' ').trim();
+  const composed = composeName(firstName, lastName);
   const existingName = String(merged?.user?.name || '').trim();
   const resolvedName = existingName || composed || fullName || senderLocal || merged?.user?.id || '';
+  const unencrypted = merged.omemoEncrypted !== 'true' && isE2eeRoom(String(merged.roomJid || ''));
+  const sealedKeys = merged.clientEncrypted === 'true' ? parseSealedMediaBody(merged.body) : undefined;
   const message = {
     ...merged,
+    ...(unencrypted ? {
+      unencrypted: true
+    } : {}),
+    ...(sealedKeys ? {
+      e2eeKeys: sealedKeys,
+      body: 'media'
+    } : {}),
     user: {
       ...(merged.user || {}),
       id: merged?.user?.id || fromResource || senderLocal,

package/lib/module/helpers/createMessageFromXml.js.map

@@ -1 +1 @@
-{"version":3,"names":["createMessageFromXml","arg","bodyEl","positionalId","positionalFrom","positionalDeleted","console","log","id","body","date","user","name","roomJid","isPositional","undefined","inner","outerExtras","bodyText","getText","text","split","xmppFrom","deleted","data","merged","isDeleted","numericPart","exec","String","Date","slice","toISOString","now","firstName","senderFirstName","toString","trim","lastName","senderLastName","fullName","senderJID","senderLocal","includes","fromResource","composed","filter","Boolean","join","existingName","resolvedName","message"],"sourceRoot":"../../../src","sources":["helpers/createMessageFromXml.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["isE2eeRoom","composeName","parseSealedMediaBody","createMessageFromXml","arg","bodyEl","positionalId","positionalFrom","positionalDeleted","console","log","id","body","date","user","name","roomJid","isPositional","undefined","inner","outerExtras","bodyText","getText","text","split","xmppFrom","deleted","data","merged","isDeleted","numericPart","exec","String","Date","slice","toISOString","now","firstName","senderFirstName","toString","trim","lastName","senderLastName","fullName","senderJID","senderBare","senderResource","includes","senderIsOccupant","test","senderLocal","fromResource","composed","existingName","resolvedName","unencrypted","omemoEncrypted","sealedKeys","clientEncrypted","message","e2eeKeys"],"sourceRoot":"../../../src","sources":["helpers/createMessageFromXml.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/helpers/createUserNameFromSetUser.js

@@ -1,5 +1,7 @@
 "use strict";
 
+import { composeName } from './displayName';
+
 /**
  * Cache-only lookup. Returns the literal "Deleted User" as a MISS sentinel
  * when `usersSet` has no entry for `userId` yet, callers that want a
@@ -17,7 +19,7 @@ export const createUserNameFromSetUser = (usersSet, userId) => {
   // members (no REST match yet) carry just the roster `name` attr —
   // fall back to that before giving up and returning the raw id.
   const bareName = user.name?.trim() || '';
-  return `${firstName} ${lastName}`.trim() || bareName || userId;
+  return composeName(firstName, lastName) || bareName || userId;
 };
 
 /**

package/lib/module/helpers/createUserNameFromSetUser.js.map

@@ -1 +1 @@
-{"version":3,"names":["createUserNameFromSetUser","usersSet","userId","user","firstName","trim","lastName","bareName","name","resolveSenderDisplayName","message","rawUserId","String","id","localUserId","split","currentNameRaw","currentName","dataFullName","fullName","dataFirst","senderFirstName","dataLast","senderLastName","composedFromData","usersSetName","usersSetNameAlt","isUsersSetUseful"],"sourceRoot":"../../../src","sources":["helpers/createUserNameFromSetUser.ts"],"mappings":";;AAEA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMA,yBAAyB,GAAGA,CACvCC,QAAoC,EACpCC,MAAc,KACH;EACX,MAAMC,IAAI,GAAGF,QAAQ,CAACC,MAAM,CAAC;EAE7B,IAAI,CAACC,IAAI,EAAE;IAAC,OAAO,cAAc;EAAC;EAElC,MAAMC,SAAS,GAAGD,IAAI,CAACC,SAAS,EAAEC,IAAI,CAAC,CAAC,IAAI,EAAE;EAC9C,MAAMC,QAAQ,GAAGH,IAAI,CAACG,QAAQ,EAAED,IAAI,CAAC,CAAC,IAAI,EAAE;EAC5C;EACA;EACA;EACA,MAAME,QAAQ,GAAGJ,IAAI,CAACK,IAAI,EAAEH,IAAI,CAAC,CAAC,IAAI,EAAE;EAExC,OAAO,GAAGD,SAAS,IAAIE,QAAQ,EAAE,CAACD,IAAI,CAAC,CAAC,IAAIE,QAAQ,IAAIL,MAAM;AAChE,CAAC;;AAED;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMO,wBAAwB,GAAGA,CACtCC,OAIC,EACDT,QAAoC,KACzB;EACX,MAAMU,SAAS,GAAGC,MAAM,CAACF,OAAO,EAAEP,IAAI,EAAEU,EAAE,IAAI,EAAE,CAAC;EACjD,MAAMC,WAAW,GAAGH,SAAS,CAACI,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;EAC3C,MAAMC,cAAc,GAAGJ,MAAM,CAACF,OAAO,EAAEP,IAAI,EAAEK,IAAI,IAAI,EAAE,CAAC,CAACH,IAAI,CAAC,CAAC;EAC/D;EACA;EACA,MAAMY,WAAW,GAAGD,cAAc,KAAK,cAAc,GAAG,EAAE,GAAGA,cAAc;EAE3E,MAAME,YAAY,GAAGN,MAAM,CAACF,OAAO,EAAES,QAAQ,IAAI,EAAE,CAAC,CAACd,IAAI,CAAC,CAAC;EAC3D,MAAMe,SAAS,GAAGR,MAAM,CAACF,OAAO,EAAEW,eAAe,IAAI,EAAE,CAAC,CAAChB,IAAI,CAAC,CAAC;EAC/D,MAAMiB,QAAQ,GAAGV,MAAM,CAACF,OAAO,EAAEa,cAAc,IAAI,EAAE,CAAC,CAAClB,IAAI,CAAC,CAAC;EAC7D,MAAMmB,gBAAgB,GAAGN,YAAY,IAAI,GAAGE,SAAS,IAAIE,QAAQ,EAAE,CAACjB,IAAI,CAAC,CAAC;EAE1E,MAAMoB,YAAY,GAAGzB,yBAAyB,CAACC,QAAQ,EAAEa,WAAW,CAAC;EACrE,MAAMY,eAAe,GAAG1B,yBAAyB,CAACC,QAAQ,EAAEU,SAAS,CAAC;EACtE,MAAMgB,gBAAgB,GAAInB,IAAY,IAAK,CAAC,CAACA,IAAI,IAAIA,IAAI,KAAK,cAAc;EAE5E,OACES,WAAW,IACVU,gBAAgB,CAACF,YAAY,CAAC,IAAIA,YAAa,IAC/CE,gBAAgB,CAACD,eAAe,CAAC,IAAIA,eAAgB,IACtDF,gBAAgB,IAChBV,WAAW,IACXH,SAAS,IACT,cAAc;AAElB,CAAC","ignoreList":[]}
+{"version":3,"names":["composeName","createUserNameFromSetUser","usersSet","userId","user","firstName","trim","lastName","bareName","name","resolveSenderDisplayName","message","rawUserId","String","id","localUserId","split","currentNameRaw","currentName","dataFullName","fullName","dataFirst","senderFirstName","dataLast","senderLastName","composedFromData","usersSetName","usersSetNameAlt","isUsersSetUseful"],"sourceRoot":"../../../src","sources":["helpers/createUserNameFromSetUser.ts"],"mappings":";;AACA,SAASA,WAAW,QAAQ,eAAe;;AAE3C;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMC,yBAAyB,GAAGA,CACvCC,QAAoC,EACpCC,MAAc,KACH;EACX,MAAMC,IAAI,GAAGF,QAAQ,CAACC,MAAM,CAAC;EAE7B,IAAI,CAACC,IAAI,EAAE;IAAC,OAAO,cAAc;EAAC;EAElC,MAAMC,SAAS,GAAGD,IAAI,CAACC,SAAS,EAAEC,IAAI,CAAC,CAAC,IAAI,EAAE;EAC9C,MAAMC,QAAQ,GAAGH,IAAI,CAACG,QAAQ,EAAED,IAAI,CAAC,CAAC,IAAI,EAAE;EAC5C;EACA;EACA;EACA,MAAME,QAAQ,GAAGJ,IAAI,CAACK,IAAI,EAAEH,IAAI,CAAC,CAAC,IAAI,EAAE;EAExC,OAAON,WAAW,CAACK,SAAS,EAAEE,QAAQ,CAAC,IAAIC,QAAQ,IAAIL,MAAM;AAC/D,CAAC;;AAED;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMO,wBAAwB,GAAGA,CACtCC,OAIC,EACDT,QAAoC,KACzB;EACX,MAAMU,SAAS,GAAGC,MAAM,CAACF,OAAO,EAAEP,IAAI,EAAEU,EAAE,IAAI,EAAE,CAAC;EACjD,MAAMC,WAAW,GAAGH,SAAS,CAACI,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;EAC3C,MAAMC,cAAc,GAAGJ,MAAM,CAACF,OAAO,EAAEP,IAAI,EAAEK,IAAI,IAAI,EAAE,CAAC,CAACH,IAAI,CAAC,CAAC;EAC/D;EACA;EACA,MAAMY,WAAW,GAAGD,cAAc,KAAK,cAAc,GAAG,EAAE,GAAGA,cAAc;EAE3E,MAAME,YAAY,GAAGN,MAAM,CAACF,OAAO,EAAES,QAAQ,IAAI,EAAE,CAAC,CAACd,IAAI,CAAC,CAAC;EAC3D,MAAMe,SAAS,GAAGR,MAAM,CAACF,OAAO,EAAEW,eAAe,IAAI,EAAE,CAAC,CAAChB,IAAI,CAAC,CAAC;EAC/D,MAAMiB,QAAQ,GAAGV,MAAM,CAACF,OAAO,EAAEa,cAAc,IAAI,EAAE,CAAC,CAAClB,IAAI,CAAC,CAAC;EAC7D,MAAMmB,gBAAgB,GAAGN,YAAY,IAAI,GAAGE,SAAS,IAAIE,QAAQ,EAAE,CAACjB,IAAI,CAAC,CAAC;EAE1E,MAAMoB,YAAY,GAAGzB,yBAAyB,CAACC,QAAQ,EAAEa,WAAW,CAAC;EACrE,MAAMY,eAAe,GAAG1B,yBAAyB,CAACC,QAAQ,EAAEU,SAAS,CAAC;EACtE,MAAMgB,gBAAgB,GAAInB,IAAY,IAAK,CAAC,CAACA,IAAI,IAAIA,IAAI,KAAK,cAAc;EAE5E,OACES,WAAW,IACVU,gBAAgB,CAACF,YAAY,CAAC,IAAIA,YAAa,IAC/CE,gBAAgB,CAACD,eAAe,CAAC,IAAIA,eAAgB,IACtDF,gBAAgB,IAChBV,WAAW,IACXH,SAAS,IACT,cAAc;AAElB,CAAC","ignoreList":[]}

package/lib/module/helpers/displayName.js

@@ -0,0 +1,11 @@
+"use strict";
+
+export const composeName = (first, last) => {
+  const f = String(first ?? '').trim();
+  const l = String(last ?? '').trim();
+  if (f && f.includes('@') && f.toLowerCase() === l.toLowerCase()) {
+    return f;
+  }
+  return `${f} ${l}`.trim();
+};
+//# sourceMappingURL=displayName.js.map

package/lib/module/helpers/displayName.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["composeName","first","last","f","String","trim","l","includes","toLowerCase"],"sourceRoot":"../../../src","sources":["helpers/displayName.ts"],"mappings":";;AAAA,OAAO,MAAMA,WAAW,GAAGA,CACzBC,KAAqB,EACrBC,IAAoB,KACT;EACX,MAAMC,CAAC,GAAGC,MAAM,CAACH,KAAK,IAAI,EAAE,CAAC,CAACI,IAAI,CAAC,CAAC;EACpC,MAAMC,CAAC,GAAGF,MAAM,CAACF,IAAI,IAAI,EAAE,CAAC,CAACG,IAAI,CAAC,CAAC;EACnC,IAAIF,CAAC,IAAIA,CAAC,CAACI,QAAQ,CAAC,GAAG,CAAC,IAAIJ,CAAC,CAACK,WAAW,CAAC,CAAC,KAAKF,CAAC,CAACE,WAAW,CAAC,CAAC,EAAE;IAAC,OAAOL,CAAC;EAAC;EAC3E,OAAO,GAAGA,CAAC,IAAIG,CAAC,EAAE,CAACD,IAAI,CAAC,CAAC;AAC3B,CAAC","ignoreList":[]}

package/lib/module/helpers/persistCrypto.js

@@ -60,6 +60,10 @@ const loadOrCreateKey = () => {
   })();
   return cachedKeyPromise;
 };
+export async function isPersistKeyKept() {
+  const key = await loadOrCreateKey();
+  return (await secureGet(CIPHER_KEY_STORE_KEY)) === CryptoJS.enc.Base64.stringify(key);
+}
 
 /** Encrypt a JSON-serialisable payload for storage. Returns the string to persist. */
 export async function encryptForPersist(plaintext) {

package/lib/module/helpers/persistCrypto.js.map

@@ -1 +1 @@
-{"version":3,"names":["CryptoJS","secureGet","secureSet","CIPHER_KEY_STORE_KEY","ENVELOPE_VERSION","KEY_BYTES","IV_BYTES","randomWordArray","byteLength","bytes","Uint8Array","global","crypto","getRandomValues","words","i","length","push","lib","WordArray","create","cachedKeyPromise","loadOrCreateKey","existing","enc","Base64","parse","key","stringify","encryptForPersist","plaintext","iv","encrypted","AES","encrypt","mode","CBC","padding","pad","Pkcs7","envelope","v","ct","ciphertext","toString","JSON","decryptFromPersist","stored","decrypted","decrypt","Utf8","__resetPersistCryptoKeyForTests"],"sourceRoot":"../../../src","sources":["helpers/persistCrypto.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["CryptoJS","secureGet","secureSet","CIPHER_KEY_STORE_KEY","ENVELOPE_VERSION","KEY_BYTES","IV_BYTES","randomWordArray","byteLength","bytes","Uint8Array","global","crypto","getRandomValues","words","i","length","push","lib","WordArray","create","cachedKeyPromise","loadOrCreateKey","existing","enc","Base64","parse","key","stringify","isPersistKeyKept","encryptForPersist","plaintext","iv","encrypted","AES","encrypt","mode","CBC","padding","pad","Pkcs7","envelope","v","ct","ciphertext","toString","JSON","decryptFromPersist","stored","decrypted","decrypt","Utf8","__resetPersistCryptoKeyForTests"],"sourceRoot":"../../../src","sources":["helpers/persistCrypto.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/helpers/preferencesStorage.js.map

@@ -1 +1 @@
-{"version":3,"names":["AsyncStorage","KEY","loadPreferences","raw","getItem","JSON","parse","savePreferences","patch","current","setItem","stringify","error","console","warn","clearPreferences","removeItem"],"sourceRoot":"../../../src","sources":["helpers/preferencesStorage.ts"],"mappings":";;AAAA;;AAEA,OAAOA,YAAY,MAAM,2CAA2C;AAGpE,MAAMC,GAAG,GAAG,qBAAqB;;AAEjC;;AAMA,OAAO,MAAMC,eAAe,GAAG,MAAAA,CAAA,KAAwC;EACrE,IAAI;IACF,MAAMC,GAAG,GAAG,MAAMH,YAAY,CAACI,OAAO,CAACH,GAAG,CAAC;IAC3C,OAAOE,GAAG,GAAIE,IAAI,CAACC,KAAK,CAACH,GAAG,CAAC,GAAyB,CAAC,CAAC;EAC1D,CAAC,CAAC,MAAM;IACN,OAAO,CAAC,CAAC;EACX;AACF,CAAC;AAED,OAAO,MAAMI,eAAe,GAAG,MAC7BC,KAAwB,IACN;EAClB,IAAI;IACF,MAAMC,OAAO,GAAG,MAAMP,eAAe,CAAC,CAAC;IACvC,MAAMF,YAAY,CAACU,OAAO,CAACT,GAAG,EAAEI,IAAI,CAACM,SAAS,CAAC;MAAE,GAAGF,OAAO;MAAE,GAAGD;IAAM,CAAC,CAAC,CAAC;EAC3E,CAAC,CAAC,OAAOI,KAAK,EAAE;IACdC,OAAO,CAACC,IAAI,CAAC,2BAA2B,EAAEF,KAAK,CAAC;EAClD;AACF,CAAC;AAED,OAAO,MAAMG,gBAAgB,GAAG,MAAAA,CAAA,KAA2B;EACzD,IAAI;IACF,MAAMf,YAAY,CAACgB,UAAU,CAACf,GAAG,CAAC;EACpC,CAAC,CAAC,MAAM;IACN;EAAA;AAEJ,CAAC","ignoreList":[]}
+{"version":3,"names":["AsyncStorage","KEY","loadPreferences","raw","getItem","JSON","parse","savePreferences","patch","current","setItem","stringify","error","console","warn","clearPreferences","removeItem"],"sourceRoot":"../../../src","sources":["helpers/preferencesStorage.ts"],"mappings":";;AAAA;;AAEA,OAAOA,YAAY,MAAM,2CAA2C;AAGpE,MAAMC,GAAG,GAAG,qBAAqB;;AAEjC;;AAUA,OAAO,MAAMC,eAAe,GAAG,MAAAA,CAAA,KAAwC;EACrE,IAAI;IACF,MAAMC,GAAG,GAAG,MAAMH,YAAY,CAACI,OAAO,CAACH,GAAG,CAAC;IAC3C,OAAOE,GAAG,GAAIE,IAAI,CAACC,KAAK,CAACH,GAAG,CAAC,GAAyB,CAAC,CAAC;EAC1D,CAAC,CAAC,MAAM;IACN,OAAO,CAAC,CAAC;EACX;AACF,CAAC;AAED,OAAO,MAAMI,eAAe,GAAG,MAC7BC,KAAwB,IACN;EAClB,IAAI;IACF,MAAMC,OAAO,GAAG,MAAMP,eAAe,CAAC,CAAC;IACvC,MAAMF,YAAY,CAACU,OAAO,CAACT,GAAG,EAAEI,IAAI,CAACM,SAAS,CAAC;MAAE,GAAGF,OAAO;MAAE,GAAGD;IAAM,CAAC,CAAC,CAAC;EAC3E,CAAC,CAAC,OAAOI,KAAK,EAAE;IACdC,OAAO,CAACC,IAAI,CAAC,2BAA2B,EAAEF,KAAK,CAAC;EAClD;AACF,CAAC;AAED,OAAO,MAAMG,gBAAgB,GAAG,MAAAA,CAAA,KAA2B;EACzD,IAAI;IACF,MAAMf,YAAY,CAACgB,UAAU,CAACf,GAAG,CAAC;EACpC,CAAC,CAAC,MAAM;IACN;EAAA;AAEJ,CAAC","ignoreList":[]}

package/lib/module/helpers/secureKeyValue.js

@@ -67,6 +67,25 @@ export async function secureRemove(key) {
   }
   await AsyncStorage.removeItem(FALLBACK_PREFIX + key).catch(() => undefined);
 }
+export async function secureGetOrCreate(key, create) {
+  const existing = await secureGet(key);
+  if (existing) {
+    return {
+      value: existing,
+      created: false
+    };
+  }
+  const value = create();
+  await secureSet(key, value);
+  if ((await secureGet(key)) !== value) {
+    pushLog('warn', `secureStore: ${key} was not kept`);
+    return null;
+  }
+  return {
+    value,
+    created: true
+  };
+}
 
 /** Test seam only. */
 export const __resetSecureKeyValueWarningForTests = () => {

package/lib/module/helpers/secureKeyValue.js.map

@@ -1 +1 @@
-{"version":3,"names":["AsyncStorage","loadSecureStore","pushLog","FALLBACK_PREFIX","warnedFallback","warnFallbackOnce","secureGet","key","store","getItemAsync","e","getItem","secureSet","value","setItemAsync","removeItem","catch","undefined","setItem","secureRemove","deleteItemAsync","__resetSecureKeyValueWarningForTests"],"sourceRoot":"../../../src","sources":["helpers/secureKeyValue.ts"],"mappings":";;AAAA,OAAOA,YAAY,MAAM,2CAA2C;AACpE,SAASC,eAAe,QAAQ,sBAAsB;AACtD,SAASC,OAAO,QAAQ,oBAAoB;;AAE5C;AACA;AACA;AACA;AACA,MAAMC,eAAe,GAAG,0BAA0B;AAElD,IAAIC,cAAc,GAAG,KAAK;AAC1B,MAAMC,gBAAgB,GAAGA,CAAA,KAAM;EAC7B,IAAID,cAAc,EAAE;IAAC;EAAO;EAC5BA,cAAc,GAAG,IAAI;EACrBF,OAAO,CACL,MAAM,EACN,6DAA6D,GAC3D,gEAAgE,GAChE,mEAAmE,GACnE,mEAAmE,GACnE,yBACJ,CAAC;AACH,CAAC;;AAED;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,eAAeI,SAASA,CAACC,GAAW,EAA0B;EACnE,MAAMC,KAAK,GAAGP,eAAe,CAAC,CAAC;EAC/B,IAAIO,KAAK,EAAE;IACT,IAAI;MACF,OAAO,MAAMA,KAAK,CAACC,YAAY,CAACF,GAAG,CAAC;IACtC,CAAC,CAAC,OAAOG,CAAC,EAAE;MACVR,OAAO,CAAC,MAAM,EAAE,6BAA6BK,GAAG,UAAU,EAAEG,CAAC,CAAC;MAC9D,OAAO,IAAI;IACb;EACF;EACAL,gBAAgB,CAAC,CAAC;EAClB,OAAOL,YAAY,CAACW,OAAO,CAACR,eAAe,GAAGI,GAAG,CAAC;AACpD;AAEA,OAAO,eAAeK,SAASA,CAACL,GAAW,EAAEM,KAAa,EAAiB;EACzE,MAAML,KAAK,GAAGP,eAAe,CAAC,CAAC;EAC/B,IAAIO,KAAK,EAAE;IACT,IAAI;MACF,MAAMA,KAAK,CAACM,YAAY,CAACP,GAAG,EAAEM,KAAK,CAAC;MACpC;MACA;MACAb,YAAY,CAACe,UAAU,CAACZ,eAAe,GAAGI,GAAG,CAAC,CAACS,KAAK,CAAC,MAAMC,SAAS,CAAC;MACrE;IACF,CAAC,CAAC,OAAOP,CAAC,EAAE;MACVR,OAAO,CAAC,MAAM,EAAE,6BAA6BK,GAAG,UAAU,EAAEG,CAAC,CAAC;MAC9D;IACF;EACF;EACAL,gBAAgB,CAAC,CAAC;EAClB,MAAML,YAAY,CAACkB,OAAO,CAACf,eAAe,GAAGI,GAAG,EAAEM,KAAK,CAAC;AAC1D;AAEA,OAAO,eAAeM,YAAYA,CAACZ,GAAW,EAAiB;EAC7D,MAAMC,KAAK,GAAGP,eAAe,CAAC,CAAC;EAC/B,IAAIO,KAAK,EAAE;IACT,IAAI;MACF,MAAMA,KAAK,CAACY,eAAe,CAACb,GAAG,CAAC;IAClC,CAAC,CAAC,MAAM;MACN;MACA;IAAA;EAEJ;EACA,MAAMP,YAAY,CAACe,UAAU,CAACZ,eAAe,GAAGI,GAAG,CAAC,CAACS,KAAK,CAAC,MAAMC,SAAS,CAAC;AAC7E;;AAEA;AACA,OAAO,MAAMI,oCAAoC,GAAGA,CAAA,KAAY;EAC9DjB,cAAc,GAAG,KAAK;AACxB,CAAC","ignoreList":[]}
+{"version":3,"names":["AsyncStorage","loadSecureStore","pushLog","FALLBACK_PREFIX","warnedFallback","warnFallbackOnce","secureGet","key","store","getItemAsync","e","getItem","secureSet","value","setItemAsync","removeItem","catch","undefined","setItem","secureRemove","deleteItemAsync","secureGetOrCreate","create","existing","created","__resetSecureKeyValueWarningForTests"],"sourceRoot":"../../../src","sources":["helpers/secureKeyValue.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/helpers/videoCache.js

@@ -0,0 +1,125 @@
+"use strict";
+
+import * as FileSystem from 'expo-file-system/legacy';
+import { filenameFromUrl, getExtensionForMime } from './mimeToExtension';
+
+// Containers the native players open from a local file by extension.
+const VIDEO_EXT_RE = /\.(mp4|mov|m4v|webm|3gp|mkv|mpeg)$/i;
+const hashString = value => {
+  let hash = 5381;
+  for (let i = 0; i < value.length; i++) {
+    hash = hash * 33 ^ value.charCodeAt(i);
+  }
+  return (hash >>> 0).toString(36);
+};
+export const isRemoteUrl = url => /^https?:\/\//i.test(url || '');
+const hostOf = url => (/^https?:\/\/(?:[^@/]+@)?([^:/?#]+)/i.exec(url)?.[1] || '').toLowerCase();
+
+// The query carries the short-lived file token; the file is the same.
+const withoutQuery = url => url.split('#')[0].split('?')[0];
+
+/**
+ * Where a remote video is kept once downloaded. The extension matters:
+ * AVFoundation picks the demuxer of a local file by it.
+ */
+export const getVideoCacheUri = (url, mimetype, cacheDirectory) => {
+  const fromUrl = VIDEO_EXT_RE.exec(filenameFromUrl(url))?.[0];
+  const fromMime = getExtensionForMime(mimetype);
+  const ext = (fromUrl || (VIDEO_EXT_RE.test(fromMime) ? fromMime : '.mp4')).toLowerCase();
+  return `${cacheDirectory}ethora-video-${hashString(withoutQuery(url))}${ext}`;
+};
+
+/**
+ * Hosts that answered a streaming attempt with an error. AVPlayer refuses a
+ * server that replies 200 to a byte-range request ("server is not correctly
+ * configured"), so for those the next video skips the doomed stream and
+ * downloads straight away.
+ */
+const hostsWithoutStreaming = new Set();
+export const markStreamingUnsupported = url => {
+  const host = hostOf(url);
+  if (host) {
+    hostsWithoutStreaming.add(host);
+  }
+};
+export const isStreamingUnsupported = url => hostsWithoutStreaming.has(hostOf(url));
+export const findCachedVideo = async (url, mimetype) => {
+  const cacheDirectory = FileSystem.cacheDirectory;
+  if (!cacheDirectory || !isRemoteUrl(url)) {
+    return null;
+  }
+  try {
+    const uri = getVideoCacheUri(url, mimetype, cacheDirectory);
+    const info = await FileSystem.getInfoAsync(uri);
+    return info.exists ? uri : null;
+  } catch {
+    return null;
+  }
+};
+const inFlight = new Map();
+
+/**
+ * Downloads the video next to the app's other caches and resolves with the
+ * local uri. One download per file however many callers ask; `onProgress`
+ * gets 0..1 when the server reports a length.
+ */
+export const downloadVideoToCache = (url, mimetype, onProgress) => {
+  const cacheDirectory = FileSystem.cacheDirectory;
+  if (!cacheDirectory) {
+    return Promise.reject(new Error('video_cache_unavailable'));
+  }
+  const finalUri = getVideoCacheUri(url, mimetype, cacheDirectory);
+  const running = inFlight.get(finalUri);
+  if (running) {
+    if (onProgress) {
+      running.listeners.add(onProgress);
+    }
+    return running.promise;
+  }
+  const listeners = new Set();
+  if (onProgress) {
+    listeners.add(onProgress);
+  }
+  const run = async () => {
+    // Download under another name: an interrupted download must not be
+    // mistaken for the cached file next time.
+    const part = `${finalUri}.part`;
+    await FileSystem.deleteAsync(part, {
+      idempotent: true
+    }).catch(() => {});
+    const task = FileSystem.createDownloadResumable(url, part, {}, p => {
+      if (p.totalBytesExpectedToWrite > 0) {
+        const fraction = Math.min(1, p.totalBytesWritten / p.totalBytesExpectedToWrite);
+        listeners.forEach(listener => listener(fraction));
+      }
+    });
+    const result = await task.downloadAsync();
+    if (!result || result.status < 200 || result.status >= 300) {
+      await FileSystem.deleteAsync(part, {
+        idempotent: true
+      }).catch(() => {});
+      throw new Error(`video_download_status_${result?.status ?? 'cancelled'}`);
+    }
+    await FileSystem.deleteAsync(finalUri, {
+      idempotent: true
+    }).catch(() => {});
+    await FileSystem.moveAsync({
+      from: part,
+      to: finalUri
+    });
+    return finalUri;
+  };
+  const promise = run().finally(() => {
+    inFlight.delete(finalUri);
+  });
+  inFlight.set(finalUri, {
+    promise,
+    listeners
+  });
+  return promise;
+};
+export const __resetVideoCacheForTests = () => {
+  hostsWithoutStreaming.clear();
+  inFlight.clear();
+};
+//# sourceMappingURL=videoCache.js.map

package/lib/module/helpers/videoCache.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["FileSystem","filenameFromUrl","getExtensionForMime","VIDEO_EXT_RE","hashString","value","hash","i","length","charCodeAt","toString","isRemoteUrl","url","test","hostOf","exec","toLowerCase","withoutQuery","split","getVideoCacheUri","mimetype","cacheDirectory","fromUrl","fromMime","ext","hostsWithoutStreaming","Set","markStreamingUnsupported","host","add","isStreamingUnsupported","has","findCachedVideo","uri","info","getInfoAsync","exists","inFlight","Map","downloadVideoToCache","onProgress","Promise","reject","Error","finalUri","running","get","listeners","promise","run","part","deleteAsync","idempotent","catch","task","createDownloadResumable","p","totalBytesExpectedToWrite","fraction","Math","min","totalBytesWritten","forEach","listener","result","downloadAsync","status","moveAsync","from","to","finally","delete","set","__resetVideoCacheForTests","clear"],"sourceRoot":"../../../src","sources":["helpers/videoCache.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/hooks/useChatSettingState.js

@@ -5,6 +5,7 @@ export const useChatSettingState = () => {
   const user = useSelector(state => state.chatSettingStore.user);
   const activeFile = useSelector(state => state.chatSettingStore.activeFile);
   const activeModal = useSelector(state => state.chatSettingStore.activeModal);
+  const uiLocale = useSelector(state => state.chatSettingStore.uiLocale);
   const config = useSelector(state => state.chatSettingStore.config);
   const deleteModal = useSelector(state => state.chatSettingStore.deleteModal);
   const selectedUser = useSelector(state => state.chatSettingStore.selectedUser);
@@ -12,6 +13,7 @@ export const useChatSettingState = () => {
   const client = useSelector(state => state.chatSettingStore.client);
   const translateMode = useSelector(state => state.chatSettingStore.translateMode);
   return {
+    uiLocale,
     user,
     activeFile,
     activeModal,

package/lib/module/hooks/useChatSettingState.js.map

@@ -1 +1 @@
-{"version":3,"names":["useSelector","useChatSettingState","user","state","chatSettingStore","activeFile","activeModal","config","deleteModal","selectedUser","langSource","client","translateMode"],"sourceRoot":"../../../src","sources":["hooks/useChatSettingState.tsx"],"mappings":";;AAAA,SAASA,WAAW,QAAQ,aAAa;AAGzC,OAAO,MAAMC,mBAAmB,GAAGA,CAAA,KAAM;EACvC,MAAMC,IAAI,GAAGF,WAAW,CAAEG,KAAgB,IAAKA,KAAK,CAACC,gBAAgB,CAACF,IAAI,CAAC;EAC3E,MAAMG,UAAU,GAAGL,WAAW,CAC3BG,KAAgB,IAAKA,KAAK,CAACC,gBAAgB,CAACC,UAC/C,CAAC;EACD,MAAMC,WAAW,GAAGN,WAAW,CAC5BG,KAAgB,IAAKA,KAAK,CAACC,gBAAgB,CAACE,WAC/C,CAAC;EACD,MAAMC,MAAM,GAAGP,WAAW,CACvBG,KAAgB,IAAKA,KAAK,CAACC,gBAAgB,CAACG,MAC/C,CAAC;EACD,MAAMC,WAAW,GAAGR,WAAW,CAC5BG,KAAgB,IAAKA,KAAK,CAACC,gBAAgB,CAACI,WAC/C,CAAC;EACD,MAAMC,YAAY,GAAGT,WAAW,CAC7BG,KAAgB,IAAKA,KAAK,CAACC,gBAAgB,CAACK,YAC/C,CAAC;EACD,MAAMC,UAAU,GAAGV,WAAW,CAC3BG,KAAgB,IAAKA,KAAK,CAACC,gBAAgB,CAACM,UAC/C,CAAC;EACD,MAAMC,MAAM,GAAGX,WAAW,CACvBG,KAAgB,IAAKA,KAAK,CAACC,gBAAgB,CAACO,MAC/C,CAAC;EACD,MAAMC,aAAa,GAAGZ,WAAW,CAC9BG,KAAgB,IAAKA,KAAK,CAACC,gBAAgB,CAACQ,aAC/C,CAAC;EAED,OAAO;IACLV,IAAI;IACJG,UAAU;IACVC,WAAW;IACXC,MAAM;IACNC,WAAW;IACXC,YAAY;IACZC,UAAU;IACVE,aAAa;IACbD;EACF,CAAC;AACH,CAAC","ignoreList":[]}
+{"version":3,"names":["useSelector","useChatSettingState","user","state","chatSettingStore","activeFile","activeModal","uiLocale","config","deleteModal","selectedUser","langSource","client","translateMode"],"sourceRoot":"../../../src","sources":["hooks/useChatSettingState.tsx"],"mappings":";;AAAA,SAASA,WAAW,QAAQ,aAAa;AAGzC,OAAO,MAAMC,mBAAmB,GAAGA,CAAA,KAAM;EACvC,MAAMC,IAAI,GAAGF,WAAW,CAAEG,KAAgB,IAAKA,KAAK,CAACC,gBAAgB,CAACF,IAAI,CAAC;EAC3E,MAAMG,UAAU,GAAGL,WAAW,CAC3BG,KAAgB,IAAKA,KAAK,CAACC,gBAAgB,CAACC,UAC/C,CAAC;EACD,MAAMC,WAAW,GAAGN,WAAW,CAC5BG,KAAgB,IAAKA,KAAK,CAACC,gBAAgB,CAACE,WAC/C,CAAC;EACD,MAAMC,QAAQ,GAAGP,WAAW,CACzBG,KAAgB,IAAKA,KAAK,CAACC,gBAAgB,CAACG,QAC/C,CAAC;EACD,MAAMC,MAAM,GAAGR,WAAW,CACvBG,KAAgB,IAAKA,KAAK,CAACC,gBAAgB,CAACI,MAC/C,CAAC;EACD,MAAMC,WAAW,GAAGT,WAAW,CAC5BG,KAAgB,IAAKA,KAAK,CAACC,gBAAgB,CAACK,WAC/C,CAAC;EACD,MAAMC,YAAY,GAAGV,WAAW,CAC7BG,KAAgB,IAAKA,KAAK,CAACC,gBAAgB,CAACM,YAC/C,CAAC;EACD,MAAMC,UAAU,GAAGX,WAAW,CAC3BG,KAAgB,IAAKA,KAAK,CAACC,gBAAgB,CAACO,UAC/C,CAAC;EACD,MAAMC,MAAM,GAAGZ,WAAW,CACvBG,KAAgB,IAAKA,KAAK,CAACC,gBAAgB,CAACQ,MAC/C,CAAC;EACD,MAAMC,aAAa,GAAGb,WAAW,CAC9BG,KAAgB,IAAKA,KAAK,CAACC,gBAAgB,CAACS,aAC/C,CAAC;EAED,OAAO;IACLN,QAAQ;IACRL,IAAI;IACJG,UAAU;IACVC,WAAW;IACXE,MAAM;IACNC,WAAW;IACXC,YAAY;IACZC,UAAU;IACVE,aAAa;IACbD;EACF,CAAC;AACH,CAAC","ignoreList":[]}