diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/MmsDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/MmsDatabase.java index 53dede3bd9..0f81dde45f 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/MmsDatabase.java +++ b/app/src/main/java/org/thoughtcrime/securesms/database/MmsDatabase.java @@ -1841,6 +1841,8 @@ public class MmsDatabase extends MessageDatabase { ContentValues contentValues = new ContentValues(); + boolean silentUpdate = (mailbox & Types.GROUP_UPDATE_BIT) > 0; + contentValues.put(DATE_SENT, retrieved.getSentTimeMillis()); contentValues.put(DATE_SERVER, retrieved.getServerTimeMillis()); contentValues.put(RECIPIENT_ID, retrieved.getFrom().serialize()); @@ -1857,7 +1859,7 @@ public class MmsDatabase extends MessageDatabase { contentValues.put(VIEW_ONCE, retrieved.isViewOnce() ? 1 : 0); contentValues.put(STORY_TYPE, retrieved.getStoryType().getCode()); contentValues.put(PARENT_STORY_ID, retrieved.getParentStoryId() != null ? retrieved.getParentStoryId().serialize() : 0); - contentValues.put(READ, retrieved.isExpirationUpdate() ? 1 : 0); + contentValues.put(READ, (silentUpdate || retrieved.isExpirationUpdate()) ? 1 : 0); contentValues.put(UNIDENTIFIED, retrieved.isUnidentified()); contentValues.put(SERVER_GUID, retrieved.getServerGuid()); diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/SmsDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/SmsDatabase.java index cb49530648..d4ee508a85 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/SmsDatabase.java +++ b/app/src/main/java/org/thoughtcrime/securesms/database/SmsDatabase.java @@ -1193,7 +1193,8 @@ public class SmsDatabase extends MessageDatabase { boolean silent = message.isIdentityUpdate() || message.isIdentityVerified() || message.isIdentityDefault() || - message.isJustAGroupLeave(); + message.isJustAGroupLeave() || + (type & Types.GROUP_UPDATE_BIT) > 0; boolean unread = !silent && (Util.isDefaultSmsProvider(context) || message.isSecureMessage() || diff --git a/app/src/main/java/org/thoughtcrime/securesms/sms/IncomingGroupUpdateMessage.java b/app/src/main/java/org/thoughtcrime/securesms/sms/IncomingGroupUpdateMessage.java index eb0557faca..e4c017e8ce 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/sms/IncomingGroupUpdateMessage.java +++ b/app/src/main/java/org/thoughtcrime/securesms/sms/IncomingGroupUpdateMessage.java @@ -13,10 +13,6 @@ public final class IncomingGroupUpdateMessage extends IncomingTextMessage { private final MessageGroupContext groupContext; - public IncomingGroupUpdateMessage(IncomingTextMessage base, GroupContext groupContext, String body) { - this(base, new MessageGroupContext(groupContext)); - } - public IncomingGroupUpdateMessage(IncomingTextMessage base, DecryptedGroupV2Context groupV2Context) { this(base, new MessageGroupContext(groupV2Context)); }