From c49d7968b7c3800fca5629750f84dd573835c71c Mon Sep 17 00:00:00 2001 From: M66B Date: Thu, 3 Oct 2019 17:02:26 +0200 Subject: [PATCH] Summary preview is optional --- app/src/main/java/eu/faircode/email/Core.java | 37 ++++++++++--------- 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java index ec2fdd9a38..770aae7703 100644 --- a/app/src/main/java/eu/faircode/email/Core.java +++ b/app/src/main/java/eu/faircode/email/Core.java @@ -2765,26 +2765,27 @@ class Core { .setVisibility(NotificationCompat.VISIBILITY_PRIVATE) .setPublicVersion(pub); - if (redacted) - builder.setContentText(context.getString(R.string.title_setup_biometrics)); - else { - DateFormat DTF = Helper.getDateTimeInstance(context, SimpleDateFormat.SHORT, SimpleDateFormat.SHORT); - StringBuilder sb = new StringBuilder(); - for (EntityMessage message : messages) { - sb.append("").append(messageContact.get(message).getDisplayName(name_email)).append(""); - if (!TextUtils.isEmpty(message.subject)) - sb.append(": ").append(message.subject); - sb.append(" ").append(DTF.format(message.received)); - sb.append("
"); + if (notify_preview) + if (redacted) + builder.setContentText(context.getString(R.string.title_setup_biometrics)); + else { + DateFormat DTF = Helper.getDateTimeInstance(context, SimpleDateFormat.SHORT, SimpleDateFormat.SHORT); + StringBuilder sb = new StringBuilder(); + for (EntityMessage message : messages) { + sb.append("").append(messageContact.get(message).getDisplayName(name_email)).append(""); + if (!TextUtils.isEmpty(message.subject)) + sb.append(": ").append(message.subject); + sb.append(" ").append(DTF.format(message.received)); + sb.append("
"); + } + + builder.setContentText(sb.toString()); + + builder.setStyle(new NotificationCompat.BigTextStyle() + .bigText(HtmlHelper.fromHtml(sb.toString())) + .setSummaryText(title)); } - builder.setContentText(sb.toString()); - - builder.setStyle(new NotificationCompat.BigTextStyle() - .bigText(HtmlHelper.fromHtml(sb.toString())) - .setSummaryText(title)); - } - notifications.add(builder.build()); }