@bobfrankston/rmfmail 1.2.213 → 1.2.215

package/client/android-bootstrap.bundle.js

@@ -7820,19 +7820,38 @@ function unquote(s) {
     return s.slice(1, -1).replace(/\\(.)/g, "$1");
   return s;
 }
+function decoderFor(label) {
+  const raw = label.trim().toLowerCase();
+  const candidates = [raw];
+  const noLang = raw.split("*")[0];
+  if (noLang !== raw)
+    candidates.push(noLang);
+  const locale = noLang.match(/^[a-z]{1,8}(?:_[a-z0-9]{1,8})?\.(.+)$/);
+  if (locale)
+    candidates.push(locale[1]);
+  candidates.push(noLang.replace(/^utf[_]?8$/, "utf-8"));
+  for (const cs of candidates) {
+    try {
+      return new TextDecoder(cs);
+    } catch {
+    }
+  }
+  return new TextDecoder("utf-8");
+}
 function decodeImapString(s) {
   if (!s)
     return "";
   const unfolded = s.replace(/\?=\s+=\?/g, "?==?");
-  return unfolded.replace(/=\?([^?]+)\?([BQ])\?([^?]+)\?=/gi, (_match, charset, encoding, text) => {
+  const rejoined = unfolded.replace(/(=\?[^?]+\?[BQ]\?[^?]*?)\s+\?=/gi, "$1?=");
+  const decodedWords = rejoined.replace(/=\?([^?]+)\?([BQ])\?([^?]+)\?=/gi, (_match, charset, encoding, text) => {
     try {
-      const cs = charset.toLowerCase().replace(/^utf8$/, "utf-8");
+      const decoder = decoderFor(charset);
       if (encoding.toUpperCase() === "B") {
         const raw = atob(text);
         const bytes = new Uint8Array(raw.length);
         for (let j = 0; j < raw.length; j++)
           bytes[j] = raw.charCodeAt(j);
-        return new TextDecoder(cs).decode(bytes);
+        return decoder.decode(bytes);
       } else {
         const decoded = text.replace(/_/g, " ");
         const bytes = [];
@@ -7846,12 +7865,13 @@ function decodeImapString(s) {
             i++;
           }
         }
-        return new TextDecoder(cs).decode(new Uint8Array(bytes));
+        return decoder.decode(new Uint8Array(bytes));
       }
     } catch {
-      return text;
+      return encoding.toUpperCase() === "Q" ? text.replace(/_/g, " ") : text;
     }
   });
+  return decodedWords.replace(/\uFEFF/g, "");
 }
 function tokenizeParenList(s) {
   const tokens = [];