Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-22 01:40:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Do not bump group threads on leave.

Browse Source
This commit is contained in:
Alan Evans
2021-01-22 14:50:48 -04:00
committed by Greyson Parrelli
parent ee548d27e5
commit 5649c906a5
4 changed files with 49 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/src/main/java/org/thoughtcrime/securesms/database/SmsDatabase.java
View File

@@ -1029,9 +1029,14 @@ public class SmsDatabase extends MessageDatabase {
groupRecipient = Recipient.resolved(id);
}
boolean unread = (org.thoughtcrime.securesms.util.Util.isDefaultSmsProvider(context) ||
message.isSecureMessage() || message.isGroup() || message.isPreKeyBundle()) &&
!message.isIdentityUpdate() && !message.isIdentityDefault() && !message.isIdentityVerified();
boolean silent = message.isIdentityUpdate() ||
message.isIdentityVerified() ||
message.isIdentityDefault() ||
message.isJustAGroupLeave();
boolean unread = !silent && (Util.isDefaultSmsProvider(context) ||
message.isSecureMessage() ||
message.isGroup() ||
message.isPreKeyBundle());
long threadId;
@@ -1070,7 +1075,7 @@ public class SmsDatabase extends MessageDatabase {
DatabaseFactory.getThreadDatabase(context).incrementUnread(threadId, 1);
}
if (!message.isIdentityUpdate() && !message.isIdentityVerified() && !message.isIdentityDefault()) {
if (!silent) {
DatabaseFactory.getThreadDatabase(context).update(threadId, true);
}
@@ -1080,7 +1085,7 @@ public class SmsDatabase extends MessageDatabase {
notifyConversationListeners(threadId);
if (!message.isIdentityUpdate() && !message.isIdentityVerified() && !message.isIdentityDefault()) {
if (!silent) {
ApplicationDependencies.getJobManager().add(new TrimThreadJob(threadId));
}