From 9bb865f8b92be1cfd8ba22ef013825e588df85e7 Mon Sep 17 00:00:00 2001 From: M66B Date: Sun, 9 Jan 2022 08:30:22 +0100 Subject: [PATCH] Limit diagnostics warning text length --- .../main/java/eu/faircode/email/MessageHelper.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java index 62e60c71a4..8251d564ad 100644 --- a/app/src/main/java/eu/faircode/email/MessageHelper.java +++ b/app/src/main/java/eu/faircode/email/MessageHelper.java @@ -144,7 +144,8 @@ public class MessageHelper { private static final int MAX_MESSAGE_SIZE = 10 * 1024 * 1024; // bytes private static final long ATTACHMENT_PROGRESS_UPDATE = 1500L; // milliseconds private static final int MAX_META_EXCERPT = 1024; // characters - private static final int FORMAT_FLOWED_LINE_LENGTH = 72; + private static final int FORMAT_FLOWED_LINE_LENGTH = 72; // characters + private static final int MAX_DIAGNOSTIC = 250; // characters private static final String DOCTYPE = ""; @@ -2920,8 +2921,12 @@ public class MessageHelper { StringBuilder w = new StringBuilder(); if (!report.isDelivered()) { - if (report.diagnostic != null) - w.append(report.diagnostic); + if (report.diagnostic != null) { + String diag = report.diagnostic; + if (diag.length() > MAX_DIAGNOSTIC) + diag = diag.substring(0, MAX_DIAGNOSTIC) + "…"; + w.append(diag); + } if (report.action != null) { if (w.length() == 0) w.append(report.action);