[SES-4516] - Improvement on unread state and community updates (#1517)

SessionHero01 · web-flow · commit 5b9e8b7c9bd4 · 2025-09-18T17:02:54.000+10:00
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/CommunityDatabase.kt b/app/src/main/java/org/thoughtcrime/securesms/database/CommunityDatabase.kt
@@ -68,7 +68,7 @@ class CommunityDatabase @Inject constructor(
             check(cursor.moveToNext()) { "Unable to patch room info" }
             json.decodeFromString<OpenGroupApi.RoomInfo>(cursor.getString(0))
         }.also {
-            if (cache[address] != it) {
+            if (cache[address]?.getOrNull() != it) {
                 cache.put(address, Optional.of(it))
                 mutableChangeNotification.tryEmit(address)
             }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java
@@ -57,6 +57,7 @@
 import org.thoughtcrime.securesms.mms.Slide;
 import org.thoughtcrime.securesms.mms.SlideDeck;
 import org.thoughtcrime.securesms.notifications.MarkReadReceiver;
+import org.thoughtcrime.securesms.util.SharedConfigUtilsKt;
 
 import java.io.Closeable;
 import java.time.ZonedDateTime;
@@ -878,6 +879,11 @@ public ThreadRecord getCurrent() {
         groupThreadStatus = GroupThreadStatus.None;
       }
 
+      final boolean isUnread = address instanceof Address.Conversable &&
+              configFactory.get().withUserConfigs(configs ->
+                SharedConfigUtilsKt.getConversationUnread(
+                        configs.getConvoInfoVolatile(), (Address.Conversable) address));
+
       MessageContent messageContent;
       try {
           messageContent = (messageContentJson == null || messageContentJson.isEmpty()) ? null : json.decodeFromString(
@@ -891,7 +897,7 @@ public ThreadRecord getCurrent() {
 
       return new ThreadRecord(body, lastMessage, recipient, date, count,
                               unreadCount, unreadMentionCount, threadId, deliveryReceiptCount, status, type,
-              lastSeen, readReceiptCount, invitingAdmin, groupThreadStatus, messageContent);
+              lastSeen, readReceiptCount, invitingAdmin, groupThreadStatus, messageContent, isUnread);
     }
 
     @Override
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/model/ThreadRecord.java b/app/src/main/java/org/thoughtcrime/securesms/database/model/ThreadRecord.java
@@ -60,6 +60,7 @@ public class ThreadRecord extends DisplayRecord {
   private           final int     unreadMentionCount;
   private           final long    lastSeen;
   private           final String invitingAdminId;
+  private           final boolean isUnread;
 
   @NonNull
   private           final GroupThreadStatus groupThreadStatus;
@@ -70,7 +71,8 @@ public ThreadRecord(@NonNull String body,
                       long snippetType,
                       long lastSeen, int readReceiptCount, String invitingAdminId,
                       @NonNull GroupThreadStatus groupThreadStatus,
-                      @Nullable MessageContent messageContent)
+                      @Nullable MessageContent messageContent,
+                      boolean isUnread)
   {
     super(body, recipient, date, date, threadId, status, deliveryReceiptCount, snippetType, readReceiptCount, messageContent);
     this.lastMessage        = lastMessage;
@@ -80,6 +82,7 @@ public ThreadRecord(@NonNull String body,
     this.lastSeen           = lastSeen;
     this.invitingAdminId    = invitingAdminId;
     this.groupThreadStatus  = groupThreadStatus;
+    this.isUnread = isUnread;
   }
 
     private String getName() {
@@ -232,4 +235,8 @@ public boolean isGroupUpdateMessage() {
     public String getInvitingAdminId() {
         return invitingAdminId;
     }
+
+    public boolean isUnread() {
+        return isUnread;
+    }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/home/ConversationOptionsBottomSheet.kt b/app/src/main/java/org/thoughtcrime/securesms/home/ConversationOptionsBottomSheet.kt
@@ -17,11 +17,9 @@ import org.session.libsession.utilities.GroupRecord
 import org.session.libsession.utilities.TextSecurePreferences
 import org.session.libsignal.utilities.AccountId
 import org.thoughtcrime.securesms.database.GroupDatabase
-import org.thoughtcrime.securesms.database.RecipientDatabase
 import org.thoughtcrime.securesms.database.model.NotifyType
 import org.thoughtcrime.securesms.database.model.ThreadRecord
 import org.thoughtcrime.securesms.dependencies.ConfigFactory
-import org.thoughtcrime.securesms.util.getConversationUnread
 import javax.inject.Inject
 
 @AndroidEntryPoint
@@ -195,7 +193,7 @@ class ConversationOptionsBottomSheet(private val parentContext: Context) : Botto
         val hasUnreadMessages = thread.unreadCount > 0
 
         // case 2
-        val isMarkedAsUnread = configFactory.withUserConfigs { it.convoInfoVolatile.getConversationUnread(thread)}
+        val isMarkedAsUnread = thread.isUnread
 
         val showMarkAsReadButton = hasUnreadMessages || isMarkedAsUnread
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/home/ConversationView.kt b/app/src/main/java/org/thoughtcrime/securesms/home/ConversationView.kt
@@ -6,15 +6,13 @@ import android.content.res.Resources
 import android.util.AttributeSet
 import android.view.View
 import android.widget.LinearLayout
-import androidx.compose.ui.platform.ViewCompositionStrategy
 import androidx.core.content.ContextCompat
 import androidx.core.view.isVisible
 import androidx.recyclerview.widget.RecyclerView
 import dagger.hilt.android.AndroidEntryPoint
 import network.loki.messenger.R
 import network.loki.messenger.databinding.ViewConversationBinding
 import org.session.libsession.utilities.ThemeUtil
-import org.session.libsession.utilities.isGroupOrCommunity
 import org.session.libsession.utilities.recipients.Recipient
 import org.session.libsession.utilities.recipients.displayName
 import org.thoughtcrime.securesms.conversation.v2.utilities.MentionUtilities.highlightMentions
@@ -23,23 +21,17 @@ import org.thoughtcrime.securesms.database.model.NotifyType
 import org.thoughtcrime.securesms.database.model.ThreadRecord
 import org.thoughtcrime.securesms.dependencies.ConfigFactory
 import org.thoughtcrime.securesms.pro.ProStatusManager
-import org.thoughtcrime.securesms.ui.ProBadgeText
 import org.thoughtcrime.securesms.ui.components.Avatar
 import org.thoughtcrime.securesms.ui.setThemedContent
-import org.thoughtcrime.securesms.ui.theme.LocalColors
 import org.thoughtcrime.securesms.ui.theme.LocalDimensions
-import org.thoughtcrime.securesms.ui.theme.LocalType
-import org.thoughtcrime.securesms.ui.theme.bold
 import org.thoughtcrime.securesms.util.AvatarUtils
 import org.thoughtcrime.securesms.util.DateUtils
 import org.thoughtcrime.securesms.util.UnreadStylingHelper
-import org.thoughtcrime.securesms.util.getConversationUnread
 import javax.inject.Inject
 
 @AndroidEntryPoint
 class ConversationView : LinearLayout {
 
-    @Inject lateinit var configFactory: ConfigFactory
     @Inject lateinit var dateUtils: DateUtils
     @Inject lateinit var proStatusManager: ProStatusManager
     @Inject lateinit var avatarUtils: AvatarUtils
@@ -65,7 +57,7 @@ class ConversationView : LinearLayout {
         this.thread = thread
         binding.iconPinned.isVisible = thread.isPinned
 
-        val isConversationUnread = (configFactory.withUserConfigs { it.convoInfoVolatile.getConversationUnread(thread) })
+        val isConversationUnread = thread.isUnread
         val unreadCount = thread.unreadCount
         val hasUnreadCount = unreadCount > 0
         val isMarkedUnread = !hasUnreadCount && isConversationUnread
diff --git a/app/src/main/java/org/thoughtcrime/securesms/home/HomeDiffUtil.kt b/app/src/main/java/org/thoughtcrime/securesms/home/HomeDiffUtil.kt
@@ -69,7 +69,7 @@ class HomeDiffUtil(
                 oldItem.isSent == newItem.isSent &&
                 oldItem.isPending == newItem.isPending &&
                 oldItem.lastSeen == newItem.lastSeen &&
-                !configFactory.withUserConfigs { it.convoInfoVolatile.getConversationUnread(newItem) } &&
+                oldItem.isUnread == newItem.isUnread &&
                 old.isTyping == new.isTyping
             )
         }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/repository/ConversationRepository.kt b/app/src/main/java/org/thoughtcrime/securesms/repository/ConversationRepository.kt
@@ -20,7 +20,6 @@ import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.withContext
 import network.loki.messenger.libsession_util.util.ExpiryMode
 import network.loki.messenger.libsession_util.util.GroupInfo
-import nl.komponents.kovenant.all
 import org.session.libsession.database.MessageDataProvider
 import org.session.libsession.database.userAuth
 import org.session.libsession.messaging.groups.GroupManagerV2
diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/SharedConfigUtils.kt b/app/src/main/java/org/thoughtcrime/securesms/util/SharedConfigUtils.kt
@@ -2,12 +2,7 @@ package org.thoughtcrime.securesms.util
 
 import network.loki.messenger.libsession_util.ReadableConversationVolatileConfig
 import org.session.libsession.utilities.Address
-import org.thoughtcrime.securesms.database.model.ThreadRecord
 
-fun ReadableConversationVolatileConfig.getConversationUnread(thread: ThreadRecord): Boolean {
-    val address = thread.recipient.address as? Address.Conversable ?: return false
-    return getConversationUnread(address)
-}
 
 fun ReadableConversationVolatileConfig.getConversationUnread(recipientAddress: Address.Conversable): Boolean {
     return when (recipientAddress) {

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ class CommunityDatabase @Inject constructor(`
`68`	`68`	`check(cursor.moveToNext()) { "Unable to patch room info" }`
`69`	`69`	`json.decodeFromString<OpenGroupApi.RoomInfo>(cursor.getString(0))`
`70`	`70`	`}.also {`
`71`		`- if (cache[address] != it) {`
	`71`	`+ if (cache[address]?.getOrNull() != it) {`
`72`	`72`	`cache.put(address, Optional.of(it))`
`73`	`73`	`mutableChangeNotification.tryEmit(address)`
`74`	`74`	`}`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ class HomeDiffUtil(`
`69`	`69`	`oldItem.isSent == newItem.isSent &&`
`70`	`70`	`oldItem.isPending == newItem.isPending &&`
`71`	`71`	`oldItem.lastSeen == newItem.lastSeen &&`
`72`		`- !configFactory.withUserConfigs { it.convoInfoVolatile.getConversationUnread(newItem) } &&`
	`72`	`+ oldItem.isUnread == newItem.isUnread &&`
`73`	`73`	`old.isTyping == new.isTyping`
`74`	`74`	`)`
`75`	`75`	`}`