@bobfrankston/rmfmail 1.2.270 → 1.2.274

package/client/android-bootstrap.bundle.js

@@ -2861,9 +2861,20 @@ function displayNameClaimsOtherAddress(name, address) {
   const m = n.match(/[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,}/g);
   if (!m)
     return null;
+  const realDomain = real.split("@").pop() || "";
   for (const claimed of m) {
-    if (claimed.toLowerCase() !== real)
-      return claimed;
+    if (claimed.toLowerCase() === real)
+      continue;
+    const claimedDomain = claimed.toLowerCase().split("@").pop() || "";
+    if (claimedDomain && realDomain) {
+      if (claimedDomain === realDomain)
+        continue;
+      if (claimedDomain.endsWith("." + realDomain))
+        continue;
+      if (realDomain.endsWith("." + claimedDomain))
+        continue;
+    }
+    return claimed;
   }
   return null;
 }
@@ -6392,6 +6403,20 @@ var WebMailxService = class _WebMailxService {
     await this.syncManager.updateFlagsLocal(accountId, uid, envelope?.folderId || 0, flags);
   }
   // ── Remote content allow-list ──
+  /** Read side of the shared allowlist, so the UI can ask whether a sender
+   *  has been vouched for. Mirrors MailxService.getAllowlist — the desktop
+   *  and Android halves must answer the same question the same way, or the
+   *  display-name warning would differ between them. */
+  async getAllowlist() {
+    const list = await loadAllowlist() || {};
+    return {
+      senders: list.senders || [],
+      domains: list.domains || [],
+      recipients: list.recipients || [],
+      flaggedSenders: list.flaggedSenders || [],
+      flaggedDomains: list.flaggedDomains || []
+    };
+  }
   async allowRemoteContent(type, value) {
     await updateAllowlist((list) => {
       if (type === "sender" && !list.senders.includes(value))
@@ -11857,6 +11882,7 @@ function installBridge() {
       await service.allowRemoteContent(type, value);
       return { ok: true };
     },
+    getAllowlist: () => service.getAllowlist(),
     flagSenderOrDomain: async (type, value) => {
       return await service.flagSenderOrDomain(type, value);
     },