Fixed updating starred messages / unified inbox widget

pull/160/head
M66B 6 years ago
parent 62587b966d
commit 496c1215e9

@ -266,6 +266,7 @@ public interface DaoMessage {
String widget = "SELECT message.*, account.name AS accountName" + String widget = "SELECT message.*, account.name AS accountName" +
", SUM(1 - message.ui_seen) AS unseen" + ", SUM(1 - message.ui_seen) AS unseen" +
", COUNT(message.id) - SUM(message.ui_flagged) AS unflagged" +
", MAX(message.received) AS dummy" + ", MAX(message.received) AS dummy" +
" FROM message" + " FROM message" +
" JOIN account ON account.id = message.account" + " JOIN account ON account.id = message.account" +

@ -202,6 +202,7 @@ public class ServiceSynchronize extends ServiceBase {
!m1.received.equals(m2.received) || !m1.received.equals(m2.received) ||
!Objects.equals(m1.subject, m2.subject) || !Objects.equals(m1.subject, m2.subject) ||
!(m1.unseen == m2.unseen) || !(m1.unseen == m2.unseen) ||
!(m1.unflagged == m2.unflagged) ||
!Objects.equals(m1.accountName, m2.accountName)) { !Objects.equals(m1.accountName, m2.accountName)) {
changed = true; changed = true;
break; break;

@ -24,6 +24,7 @@ import java.util.Objects;
public class TupleMessageWidget extends EntityMessage { public class TupleMessageWidget extends EntityMessage {
public String accountName; public String accountName;
public int unseen; public int unseen;
public int unflagged;
@Override @Override
public boolean equals(Object obj) { public boolean equals(Object obj) {
@ -31,7 +32,8 @@ public class TupleMessageWidget extends EntityMessage {
TupleMessageEx other = (TupleMessageEx) obj; TupleMessageEx other = (TupleMessageEx) obj;
return (super.equals(obj) && return (super.equals(obj) &&
Objects.equals(this.accountName, other.accountName) && Objects.equals(this.accountName, other.accountName) &&
this.unseen == other.unseen); this.unseen == other.unseen &&
this.unflagged == other.unflagged);
} }
return false; return false;
} }

Loading…
Cancel
Save