From e728240597f90d4abae1782dc064982ea4337583 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Tue, 27 Nov 2018 12:35:10 +0100
Subject: [PATCH] Set account name in notification sub text

---
 .../java/eu/faircode/email/ServiceSynchronize.java | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
index 4be3b037c1..6d874976e5 100644
--- a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
+++ b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
@@ -182,6 +182,7 @@ public class ServiceSynchronize extends LifecycleService {
 
                 Widget.update(ServiceSynchronize.this, messages.size());
 
+                LongSparseArray<String> accountName = new LongSparseArray<>();
                 LongSparseArray<List<TupleMessageEx>> accountMessages = new LongSparseArray<>();
 
                 for (int i = 0; i < notifying.size(); i++)
@@ -189,6 +190,7 @@ public class ServiceSynchronize extends LifecycleService {
 
                 for (TupleMessageEx message : messages) {
                     long account = (message.accountNotify ? message.account : 0);
+                    accountName.put(account, account > 0 ? message.accountName : null);
                     if (accountMessages.indexOfKey(account) < 0)
                         accountMessages.put(account, new ArrayList<TupleMessageEx>());
                     accountMessages.get(account).add(message);
@@ -198,7 +200,8 @@ public class ServiceSynchronize extends LifecycleService {
 
                 for (int i = 0; i < accountMessages.size(); i++) {
                     long account = accountMessages.keyAt(i);
-                    List<Notification> notifications = getNotificationUnseen(account, accountMessages.get(account));
+                    List<Notification> notifications = getNotificationUnseen(
+                            account, accountName.get(account), accountMessages.get(account));
 
                     List<Integer> all = new ArrayList<>();
                     List<Integer> added = new ArrayList<>();
@@ -391,7 +394,7 @@ public class ServiceSynchronize extends LifecycleService {
         return builder;
     }
 
-    private List<Notification> getNotificationUnseen(long account, List<TupleMessageEx> messages) {
+    private List<Notification> getNotificationUnseen(long account, String accountName, List<TupleMessageEx> messages) {
         List<Notification> notifications = new ArrayList<>();
 
         if (messages.size() == 0)
@@ -432,6 +435,9 @@ public class ServiceSynchronize extends LifecycleService {
                 .setCategory(Notification.CATEGORY_STATUS)
                 .setVisibility(Notification.VISIBILITY_PUBLIC);
 
+        if (!TextUtils.isEmpty(accountName))
+            pbuilder.setSubText(accountName);
+
         // Build notification
         Notification.Builder builder;
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O)
@@ -453,6 +459,9 @@ public class ServiceSynchronize extends LifecycleService {
                 .setGroup(group)
                 .setGroupSummary(true);
 
+        if (!TextUtils.isEmpty(accountName))
+            builder.setSubText(accountName);
+
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O)
             builder.setSound(null);
         else
@@ -534,6 +543,7 @@ public class ServiceSynchronize extends LifecycleService {
                     .addExtras(args)
                     .setSmallIcon(R.drawable.baseline_mail_24)
                     .setContentTitle(MessageHelper.getFormattedAddresses(message.from, true))
+                    .setSubText(message.accountName)
                     .setContentIntent(piContent)
                     .setSound(uri)
                     .setWhen(message.received)