From fcb56ddf0db0d13ef626a005796986a475f59660 Mon Sep 17 00:00:00 2001 From: M66B Date: Wed, 19 Apr 2023 09:13:10 +0200 Subject: [PATCH] Added check for long attachment file names --- app/src/main/java/eu/faircode/email/FragmentCompose.java | 4 ++++ app/src/main/res/values/strings.xml | 1 + 2 files changed, 5 insertions(+) diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java index 63cb7c59a7..0f477b8d8b 100644 --- a/app/src/main/java/eu/faircode/email/FragmentCompose.java +++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java @@ -4881,6 +4881,10 @@ public class FragmentCompose extends FragmentBase { Log.i(ex); } + // https://www.rfc-editor.org/rfc/rfc2231 + if (attachment.name != null && attachment.name.length() > 60) + db.attachment().setError(attachment.id, context.getString(R.string.title_attachment_filename)); + } catch (Throwable ex) { // Reset progress on failure Log.e(ex); diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 24d9d554dc..766514073e 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1661,6 +1661,7 @@ attached,attachment,attachments,included Did you intend to add an attachment? Potentially dangerous: %1$s + Some other email clients cannot handle file names longer than 60 characters All formatting will be lost Hard bounces damage the email reputation of the original sender! Message (%1$s) larger than server limit (%2$s)