Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -167,8 +167,8 @@ export class GmailParser {
// are we dealing with a PGP/MIME encrypted message?
const pgpEncrypted = Boolean(
parts.length === 2 &&
contentType?.value.startsWith('multipart/encrypted') &&
(contentType.value.includes('protocol="application/pgp-encrypted"') || parts[0].mimeType === 'application/pgp-encrypted')
contentType?.value.startsWith('multipart/encrypted') &&
(contentType.value.includes('protocol="application/pgp-encrypted"') || parts[0].mimeType === 'application/pgp-encrypted')
);
for (const [i, part] of parts.entries()) {
GmailParser.findAttachments(part, internalMsgId, internalResults, {
Expand Down
7 changes: 6 additions & 1 deletion extension/js/common/api/shared/api.ts
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,12 @@ export class Api {
}),
};
} else {
return { response, pipe: async () => { /* no-op */ } }; // original response
return {
response,
pipe: async () => {
/* no-op */
},
}; // original response
}
};

Expand Down
2 changes: 1 addition & 1 deletion extension/js/common/core/mime.ts
Original file line number Diff line number Diff line change
Expand Up @@ -481,7 +481,7 @@ export class Mime {
private static getNodeContentAsUtfStr(node: MimeParserNode): string {
// List of charset labels that map to ISO-8859-2
const iso88592Labels = ['csisolatin2', 'iso-8859-2', 'iso-ir-101', 'iso8859-2', 'iso88592', 'iso_8859-2', 'iso_8859-2:1987', 'l2', 'latin2'];

if (node.charset && node.rawContent && iso88592Labels.includes(node.charset.toLowerCase())) {
const decoder = new TextDecoder('iso-8859-2');
return decoder.decode(Buf.fromRawBytesStr(node.rawContent));
Expand Down
1 change: 0 additions & 1 deletion extension/js/common/platform/require.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ import { MimeParser } from '../core/types/emailjs.js';
import * as openpgp from 'openpgp';
import { Catch } from './catch.js';


export const requireOpenpgp = () => {
if (typeof window !== 'undefined' && typeof globalThis !== 'undefined' && window !== globalThis && Catch.browser().name === 'firefox') {
// fix Firefox sandbox permission issues as per convo https://github.com/FlowCrypt/flowcrypt-browser/pull/5013#discussion_r1148343995
Expand Down
233 changes: 158 additions & 75 deletions package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
"jquery": "3.7.1",
"linkify-html": "4.3.2",
"linkifyjs": "4.3.2",
"node-forge": "1.3.1",
"node-forge": "1.3.2",
"postcss-html": "^1.8.0",
"squire-rte": "2.4.1",
"sweetalert2": "11.26.3",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,7 @@
"full": {
"id": "15f7f5e966792203",
"threadId": "15f7f5e966792203",
"labelIds": [
"IMPORTANT",
"STARRED",
"CATEGORY_PERSONAL",
"Label_4",
"INBOX"
],
"labelIds": ["IMPORTANT", "STARRED", "CATEGORY_PERSONAL", "Label_4", "INBOX"],
"snippet": "-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Standard message signed inline should easily verify This is email footer -----BEGIN PGP SIGNATURE----- Version: FlowCrypt 5.0.4 Gmail Encryption",
"payload": {
"partId": "",
Expand Down Expand Up @@ -68,4 +62,4 @@
"historyId": "1405939",
"internalDate": "1509670425000"
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,7 @@
"full": {
"id": "15f7f5f098d6bc36",
"threadId": "15f7f5f098d6bc36",
"labelIds": [
"IMPORTANT",
"STARRED",
"Label_8",
"Label_3",
"CATEGORY_PERSONAL",
"Label_12",
"INBOX"
],
"labelIds": ["IMPORTANT", "STARRED", "Label_8", "Label_3", "CATEGORY_PERSONAL", "Label_12", "INBOX"],
"snippet": "-----BEGIN PGP MESSAGE----- Version: FlowCrypt 5.0.4 Gmail Encryption flowcrypt.com Comment: Seamlessly send, receive and search encrypted email wcFMA+ADv/5v4RgKAQ/",
"payload": {
"partId": "",
Expand Down Expand Up @@ -70,4 +62,4 @@
"historyId": "1406105",
"internalDate": "1509670454000"
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,7 @@
"full": {
"id": "15f7fcace2d72246",
"threadId": "15f7fcace2d72246",
"labelIds": [
"Label_17",
"IMPORTANT",
"STARRED",
"Label_3",
"CATEGORY_PERSONAL",
"INBOX"
],
"labelIds": ["Label_17", "IMPORTANT", "STARRED", "Label_3", "CATEGORY_PERSONAL", "INBOX"],
"snippet": "",
"payload": {
"partId": "",
Expand Down Expand Up @@ -121,4 +114,4 @@
"historyId": "1406055",
"internalDate": "1509677516000"
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,7 @@
"full": {
"id": "15f7fcb7fabc7511",
"threadId": "15f7fcb7fabc7511",
"labelIds": [
"Label_17",
"IMPORTANT",
"STARRED",
"Label_3",
"CATEGORY_PERSONAL",
"INBOX"
],
"labelIds": ["Label_17", "IMPORTANT", "STARRED", "Label_3", "CATEGORY_PERSONAL", "INBOX"],
"snippet": "-----BEGIN PGP MESSAGE----- Charset: utf-8 Version: GnuPG v2 hQIMA0taL/zmLZUBAQ//RO4wLVr52Zf0v6/fa19/noJFsFLIEqsWkX3OPOZfiRew tcI17dq5u854lbuXwSELEAUkhX0NJ2ZM+jNPRyW4dqhcuFBebBXN10/pzBaG+nKi",
"payload": {
"partId": "",
Expand Down Expand Up @@ -77,4 +70,4 @@
"historyId": "1406044",
"internalDate": "1509677562000"
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,7 @@
"full": {
"id": "15f7fd2fd072cff2",
"threadId": "15f7fd2fd072cff2",
"labelIds": [
"Label_17",
"IMPORTANT",
"STARRED",
"Label_3",
"CATEGORY_PERSONAL",
"Label_4",
"INBOX"
],
"labelIds": ["Label_17", "IMPORTANT", "STARRED", "Label_3", "CATEGORY_PERSONAL", "Label_4", "INBOX"],
"snippet": "-----BEGIN PGP MESSAGE----- Charset: utf-8 Version: GnuPG v2 hQIMA0taL/zmLZUBAQ/9FX0uRThi4ZT1KmNEZYS3WC+Noqommn5szVhI72E03HUp 3JMub2XMmU80Oe6WybHancEZw3w/oWR5CvdQx9414jub4uXxaE91wBuqlS3Ow6/o",
"payload": {
"partId": "",
Expand Down Expand Up @@ -78,4 +70,4 @@
"historyId": "1406019",
"internalDate": "1509678053000"
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,7 @@
"full": {
"id": "15f7fd3ba3f37cf3",
"threadId": "15f7fd3ba3f37cf3",
"labelIds": [
"Label_17",
"IMPORTANT",
"STARRED",
"Label_3",
"CATEGORY_PERSONAL",
"Label_4",
"INBOX"
],
"labelIds": ["Label_17", "IMPORTANT", "STARRED", "Label_3", "CATEGORY_PERSONAL", "Label_4", "INBOX"],
"snippet": "",
"payload": {
"partId": "",
Expand Down Expand Up @@ -122,4 +114,4 @@
"historyId": "1405999",
"internalDate": "1509678101000"
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,7 @@
"full": {
"id": "15f7ffbebc6ba296",
"threadId": "15f7ffbebc6ba296",
"labelIds": [
"IMPORTANT",
"STARRED",
"Label_3",
"SENT",
"INBOX"
],
"labelIds": ["IMPORTANT", "STARRED", "Label_3", "SENT", "INBOX"],
"snippet": "-----BEGIN PGP MESSAGE----- Version: FlowCrypt 5.0.4 Gmail Encryption flowcrypt.com Comment: Seamlessly send, receive and search encrypted email wcFMA+ADv/5v4RgKAQ/+K2rrAqhjMe9FLCfklI9Y30Woktg0Q/",
"payload": {
"partId": "",
Expand Down Expand Up @@ -95,4 +89,4 @@
"historyId": "1406074",
"internalDate": "1509680737000"
}
}
}
Loading
Loading