From d9b59d4896a26ea7f9893b6a9b3afa8773b309bd Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sun, 11 Nov 2018 07:17:52 +0000
Subject: [PATCH] Color code all messages

---
 .../main/java/eu/faircode/email/AdapterMessage.java    |  1 -
 app/src/main/java/eu/faircode/email/DaoMessage.java    | 10 +++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 812f31eaee..a469a516e9 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -318,7 +318,6 @@ public class AdapterMessage extends PagedListAdapter<TupleMessageEx, AdapterMess
             ivAvatar.setVisibility(photo ? View.VISIBLE : View.GONE);
 
             vwColor.setBackgroundColor(message.accountColor == null ? Color.TRANSPARENT : message.accountColor);
-            vwColor.setVisibility(viewType == ViewType.UNIFIED && message.accountColor != null ? View.VISIBLE : View.GONE);
 
             ivExpander.setImageResource(show_expanded ? R.drawable.baseline_expand_less_24 : R.drawable.baseline_expand_more_24);
             ivExpander.setVisibility(viewType == ViewType.THREAD ? View.VISIBLE : View.GONE);
diff --git a/app/src/main/java/eu/faircode/email/DaoMessage.java b/app/src/main/java/eu/faircode/email/DaoMessage.java
index 709b9b7493..6b0948d1bc 100644
--- a/app/src/main/java/eu/faircode/email/DaoMessage.java
+++ b/app/src/main/java/eu/faircode/email/DaoMessage.java
@@ -36,7 +36,7 @@ public interface DaoMessage {
     // https://www.sqlite.org/lang_select.html
 
     @Query("SELECT message.*" +
-            ", account.name AS accountName, IFNULL(identity.color,account.color) AS accountColor" +
+            ", account.name AS accountName, IFNULL(identity.color, account.color) AS accountColor" +
             ", folder.name AS folderName, folder.display AS folderDisplay, folder.type AS folderType" +
             ", COUNT(message.id) AS count" +
             ", SUM(CASE WHEN message.ui_seen" +
@@ -66,7 +66,7 @@ public interface DaoMessage {
     DataSource.Factory<Integer, TupleMessageEx> pagedUnifiedInbox(String sort, boolean debug);
 
     @Query("SELECT message.*" +
-            ", account.name AS accountName, IFNULL(identity.color,account.color) AS accountColor" +
+            ", account.name AS accountName, identity.color AS accountColor" +
             ", folder.name AS folderName, folder.display AS folderDisplay, folder.type AS folderType" +
             ", COUNT(message.id) AS count" +
             ", SUM(CASE WHEN message.ui_seen" +
@@ -97,7 +97,7 @@ public interface DaoMessage {
     DataSource.Factory<Integer, TupleMessageEx> pagedFolder(long folder, String sort, boolean found, boolean debug);
 
     @Query("SELECT message.*" +
-            ", account.name AS accountName, IFNULL(identity.color,account.color) AS accountColor" +
+            ", account.name AS accountName, identity.color AS accountColor" +
             ", folder.name AS folderName, folder.display AS folderDisplay, folder.type AS folderType" +
             ", (SELECT COUNT(m1.id) FROM message m1 WHERE m1.account = message.account AND m1.thread = message.thread AND NOT m1.ui_hide) AS count" +
             ", CASE WHEN message.ui_seen THEN 0 ELSE 1 END AS unseen" +
@@ -168,7 +168,7 @@ public interface DaoMessage {
     List<Long> getMessageWithoutPreview();
 
     @Query("SELECT message.*" +
-            ", account.name AS accountName, IFNULL(identity.color,account.color) AS accountColor" +
+            ", account.name AS accountName, identity.color AS accountColor" +
             ", folder.name AS folderName, folder.display AS folderDisplay, folder.type AS folderType" +
             ", (SELECT COUNT(m1.id) FROM message m1 WHERE m1.account = message.account AND m1.thread = message.thread AND NOT m1.ui_hide) AS count" +
             ", CASE WHEN message.ui_seen THEN 0 ELSE 1 END AS unseen" +
@@ -182,7 +182,7 @@ public interface DaoMessage {
     LiveData<TupleMessageEx> liveMessage(long id);
 
     @Query("SELECT message.*" +
-            ", account.name AS accountName, IFNULL(identity.color,account.color) AS accountColor" +
+            ", account.name AS accountName, IFNULL(identity.color, account.color) AS accountColor" +
             ", folder.name AS folderName, folder.display AS folderDisplay, folder.type AS folderType" +
             ", 1 AS count" +
             ", 1 AS unseen" +