Prevent flicker on marking expanded message read

app/src/main/java/eu/faircode/email/DaoMessage.java

@@ -42,7 +42,8 @@ public interface DaoMessage {
     String is_outbox = "folder.type = '" + EntityFolder.OUTBOX + "'";
 
     @Query("SELECT message.*" +
-            ", account.pop AS accountPop, account.name AS accountName, IFNULL(identity.color, account.color) AS accountColor, account.notify AS accountNotify" +
+            ", account.pop AS accountPop, account.name AS accountName, IFNULL(identity.color, account.color) AS accountColor" +
+            ", account.notify AS accountNotify, account.auto_seen AS accountAutoSeen" +
             ", folder.name AS folderName, folder.display AS folderDisplay, folder.type AS folderType, folder.read_only AS folderReadOnly" +
             ", identity.name AS identityName, identity.email AS identityEmail, identity.synchronize AS identitySynchronize" +
             ", '[' || group_concat(message.`from`, ',') || ']' AS senders" +
@@ -90,7 +91,8 @@ public interface DaoMessage {
             boolean debug);
 
     @Query("SELECT message.*" +
-            ", account.pop AS accountPop, account.name AS accountName, IFNULL(identity.color, account.color) AS accountColor, account.notify AS accountNotify" +
+            ", account.pop AS accountPop, account.name AS accountName, IFNULL(identity.color, account.color) AS accountColor" +
+            ", account.notify AS accountNotify, account.auto_seen AS accountAutoSeen" +
             ", folder.name AS folderName, folder.display AS folderDisplay, folder.type AS folderType, folder.read_only AS folderReadOnly" +
             ", identity.name AS identityName, identity.email AS identityEmail, identity.synchronize AS identitySynchronize" +
             ", '[' || group_concat(message.`from`, ',') || ']' AS senders" +
@@ -132,7 +134,8 @@ public interface DaoMessage {
             boolean debug);
 
     @Query("SELECT message.*" +
-            ", account.pop AS accountPop, account.name AS accountName, IFNULL(identity.color, account.color) AS accountColor, account.notify AS accountNotify" +
+            ", account.pop AS accountPop, account.name AS accountName, IFNULL(identity.color, account.color) AS accountColor" +
+            ", account.notify AS accountNotify, account.auto_seen AS accountAutoSeen" +
             ", folder.name AS folderName, folder.display AS folderDisplay, folder.type AS folderType, folder.read_only AS folderReadOnly" +
             ", identity.name AS identityName, identity.email AS identityEmail, identity.synchronize AS identitySynchronize" +
             ", message.`from` AS senders" +
@@ -231,7 +234,8 @@ public interface DaoMessage {
     int countMessageByMsgId(long folder, String msgid);
 
     @Query("SELECT message.*" +
-            ", account.pop AS accountPop, account.name AS accountName, identity.color AS accountColor, account.notify AS accountNotify" +
+            ", account.pop AS accountPop, account.name AS accountName, identity.color AS accountColor" +
+            ", account.notify AS accountNotify, account.auto_seen AS accountAutoSeen" +
             ", folder.name AS folderName, folder.display AS folderDisplay, folder.type AS folderType, folder.read_only AS folderReadOnly" +
             ", identity.name AS identityName, identity.email AS identityEmail, identity.synchronize AS identitySynchronize" +
             ", message.`from` AS senders" +
@@ -263,7 +267,8 @@ public interface DaoMessage {
     TupleMessageStats getUnseenWidget();
 
     @Query("SELECT message.*" +
-            ", account.pop AS accountPop, account.name AS accountName, IFNULL(identity.color, account.color) AS accountColor, account.notify AS accountNotify" +
+            ", account.pop AS accountPop, account.name AS accountName, IFNULL(identity.color, account.color) AS accountColor" +
+            ", account.notify AS accountNotify, account.auto_seen AS accountAutoSeen" +
             ", folder.name AS folderName, folder.display AS folderDisplay, folder.type AS folderType, folder.read_only AS folderReadOnly" +
             ", identity.name AS identityName, identity.email AS identityEmail, identity.synchronize AS identitySynchronize" +
             ", message.`from` AS senders" +

app/src/main/java/eu/faircode/email/FragmentMessages.java

@@ -3099,8 +3099,16 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
                     expand = messages.get(0);
 
                 if (expand != null &&
-                        (expand.content || unmetered || (expand.size != null && expand.size < download)))
+                        (expand.content || unmetered || (expand.size != null && expand.size < download))) {
+                    // Prevent flicker
+                    if (expand.accountPop ||
+                            (expand.accountAutoSeen && !expand.ui_seen && !expand.folderReadOnly)) {
+                        expand.unseen = 0;
+                        expand.ui_seen = true;
+                    }
+
                     iProperties.setValue("expanded", expand.id, true);
+                }
             }
         } else {
             if (autoCloseCount > 0 && (autoclose || onclose != null)) {

app/src/main/java/eu/faircode/email/TupleMessageEx.java

@@ -30,6 +30,7 @@ public class TupleMessageEx extends EntityMessage {
     public String accountName;
     public Integer accountColor;
     public boolean accountNotify;
+    public boolean accountAutoSeen;
     public String folderName;
     public String folderDisplay;
     public String folderType;
@@ -57,6 +58,7 @@ public class TupleMessageEx extends EntityMessage {
                     Objects.equals(this.accountName, other.accountName) &&
                     Objects.equals(this.accountColor, other.accountColor) &&
                     this.accountNotify == other.accountNotify &&
+                    this.accountAutoSeen == other.accountAutoSeen &&
                     this.folderName.equals(other.folderName) &&
                     Objects.equals(this.folderDisplay, other.folderDisplay) &&
                     this.folderType.equals(other.folderType) &&