From 3c469e719c58e7f9b6fd469cc876fb9a65ddd822 Mon Sep 17 00:00:00 2001 From: M66B Date: Mon, 2 Sep 2019 12:10:02 +0200 Subject: [PATCH] Honor name/email setting for notifications --- app/src/main/java/eu/faircode/email/Core.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java index 509f58b456..a8a1cb9f80 100644 --- a/app/src/main/java/eu/faircode/email/Core.java +++ b/app/src/main/java/eu/faircode/email/Core.java @@ -2066,6 +2066,7 @@ class Core { SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); boolean biometrics = prefs.getBoolean("biometrics", false); boolean biometric_notify = prefs.getBoolean("biometrics_notify", false); + boolean name_email = prefs.getBoolean("name_email", false); boolean flags = prefs.getBoolean("flags", true); boolean notify_preview = prefs.getBoolean("notify_preview", true); boolean notify_trash = (prefs.getBoolean("notify_trash", true) || !pro); @@ -2132,7 +2133,7 @@ class Core { DateFormat DTF = Helper.getDateTimeInstance(context, SimpleDateFormat.SHORT, SimpleDateFormat.SHORT); StringBuilder sb = new StringBuilder(); for (EntityMessage message : messages) { - sb.append("").append(messageContact.get(message).getDisplayName(true)).append(""); + 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)); @@ -2234,7 +2235,7 @@ class Core { ? Helper.localizeFolderName(context, message.folderName) : message.folderDisplay; - mbuilder.setContentTitle(info.getDisplayName(true)) + mbuilder.setContentTitle(info.getDisplayName(name_email)) .setSubText(message.accountName + " ยท " + folderName); }