mirror of
https://github.com/signalapp/Signal-Android.git
synced 2025-12-25 05:27:42 +00:00
Fix unread count getting double incremented on new message.
This commit is contained in:
@@ -2834,6 +2834,8 @@ open class MessageTable(context: Context?, databaseHelper: SignalDatabase) : Dat
|
||||
contentValues.put(NOTIFIED, notified.toInt())
|
||||
}
|
||||
|
||||
val updateThread = retrieved.storyType === StoryType.NONE && !silent
|
||||
|
||||
val (messageId, insertedAttachments) = insertMediaMessage(
|
||||
threadId = threadId,
|
||||
body = retrieved.body,
|
||||
@@ -2845,7 +2847,7 @@ open class MessageTable(context: Context?, databaseHelper: SignalDatabase) : Dat
|
||||
messageRanges = retrieved.messageRanges,
|
||||
contentValues = contentValues,
|
||||
insertListener = null,
|
||||
updateThread = retrieved.storyType === StoryType.NONE && !silent,
|
||||
updateThread = updateThread,
|
||||
unarchive = true,
|
||||
poll = retrieved.poll,
|
||||
pollTerminate = retrieved.messageExtras?.pollTerminate
|
||||
@@ -2882,7 +2884,8 @@ open class MessageTable(context: Context?, databaseHelper: SignalDatabase) : Dat
|
||||
|
||||
val isNotStoryGroupReply = retrieved.parentStoryId == null || !retrieved.parentStoryId.isGroupReply()
|
||||
|
||||
if (!MessageTypes.isPaymentsActivated(type) &&
|
||||
if (!updateThread &&
|
||||
!MessageTypes.isPaymentsActivated(type) &&
|
||||
!MessageTypes.isPaymentsRequestToActivate(type) &&
|
||||
!MessageTypes.isReportedSpam(type) &&
|
||||
!MessageTypes.isMessageRequestAccepted(type) &&
|
||||
|
||||
Reference in New Issue
Block a user