[PBE-4081] hidden channel messages are shown up

CHANGELOG.md

@@ -27,6 +27,7 @@
 
 ## stream-chat-android-offline
 ### 🐞 Fixed
+- Fixed messages from hidden channels being shown up. [#5281](https://github.com/GetStream/stream-chat-android/pull/5281)
 
 ### ⬆️ Improved
 

stream-chat-android-client/api/stream-chat-android-client.api

@@ -2412,6 +2412,7 @@ public abstract interface class io/getstream/chat/android/client/persistance/rep
 	public abstract fun deleteChannelMessage (Lio/getstream/chat/android/models/Message;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public abstract fun deleteChannelMessages (Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public abstract fun deleteChannelMessagesBefore (Ljava/lang/String;Ljava/util/Date;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public abstract fun evictMessages (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public abstract fun insertMessage (Lio/getstream/chat/android/models/Message;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public abstract fun insertMessages (Ljava/util/List;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public abstract fun selectMessage (Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;

stream-chat-android-client/src/main/java/io/getstream/chat/android/client/persistance/repository/MessageRepository.kt

@@ -120,6 +120,8 @@ public interface MessageRepository {
      */
     public suspend fun selectMessageBySyncState(syncStatus: SyncStatus): List<Message>
 
+    public suspend fun evictMessages()
+
     /**
      * Clear messages of this repository.
      */

stream-chat-android-client/src/main/java/io/getstream/chat/android/client/persistance/repository/RepositoryFacade.kt

@@ -168,6 +168,16 @@ public class RepositoryFacade private constructor(
         messageRepository.deleteChannelMessages(cid)
     }
 
+    override suspend fun setHiddenForChannel(cid: String, hidden: Boolean, hideMessagesBefore: Date) {
+        channelsRepository.setHiddenForChannel(cid, hidden, hideMessagesBefore)
+        messageRepository.evictMessages()
+    }
+
+    override suspend fun setHiddenForChannel(cid: String, hidden: Boolean) {
+        channelsRepository.setHiddenForChannel(cid, hidden)
+        messageRepository.evictMessages()
+    }
+
     public suspend fun storeStateForChannel(channel: Channel) {
         storeStateForChannels(listOf(channel))
     }

stream-chat-android-client/src/main/java/io/getstream/chat/android/client/persistance/repository/noop/NoOpMessageRepository.kt

@@ -37,6 +37,8 @@ internal object NoOpMessageRepository : MessageRepository {
     override suspend fun deleteChannelMessage(message: Message) { /* No-Op */ }
     override suspend fun selectMessageIdsBySyncState(syncStatus: SyncStatus): List<String> = emptyList()
     override suspend fun selectMessageBySyncState(syncStatus: SyncStatus): List<Message> = emptyList()
+    override suspend fun evictMessages() { /* No-Op */ }
+
     override suspend fun clear() { /* No-Op */ }
     override suspend fun selectMessagesForChannel(
         cid: String,

stream-chat-android-offline/src/main/java/io/getstream/chat/android/offline/repository/domain/channel/internal/DatabaseChannelRepository.kt

@@ -153,9 +153,7 @@ internal class DatabaseChannelRepository(
      * @param deletedAt Date.
      */
     override suspend fun setChannelDeletedAt(cid: String, deletedAt: Date) {
-        channelCache[cid]?.let { cachedChannel ->
-            cacheChannel(listOf(cachedChannel.copy(deletedAt = deletedAt)))
-        }
+        channelCache.remove(cid)
         scope.launchWithMutex(dbMutex) { channelDao.setDeletedAt(cid, deletedAt) }
     }
 
@@ -167,14 +165,7 @@ internal class DatabaseChannelRepository(
      * @param hideMessagesBefore Date.
      */
     override suspend fun setHiddenForChannel(cid: String, hidden: Boolean, hideMessagesBefore: Date) {
-        channelCache[cid]?.let { cachedChannel ->
-            cacheChannel(
-                cachedChannel.copy(
-                    hidden = hidden,
-                    hiddenMessagesBefore = hideMessagesBefore,
-                ),
-            )
-        }
+        channelCache.remove(cid)
         scope.launchWithMutex(dbMutex) { channelDao.setHidden(cid, hidden, hideMessagesBefore) }
     }
 
@@ -185,9 +176,7 @@ internal class DatabaseChannelRepository(
      * @param hidden Date.
      */
     override suspend fun setHiddenForChannel(cid: String, hidden: Boolean) {
-        channelCache[cid]?.let { cachedChannel ->
-            cacheChannel(listOf(cachedChannel.copy(hidden = hidden)))
-        }
+        channelCache.remove(cid)
         scope.launchWithMutex(dbMutex) { channelDao.setHidden(cid, hidden) }
     }
 

stream-chat-android-offline/src/main/java/io/getstream/chat/android/offline/repository/domain/message/internal/DatabaseMessageRepository.kt

@@ -185,6 +185,11 @@ internal class DatabaseMessageRepository(
         return messageDao.selectBySyncStatus(syncStatus).map { it.toModel(getUser, ::selectRepliedMessage) }
     }
 
+    override suspend fun evictMessages() {
+        messageCache.evictAll()
+        replyMessageCache.evictAll()
+    }
+
     override suspend fun clear() {
         messageCache.evictAll()
         replyMessageCache.evictAll()

stream-chat-android-state/src/test/java/io/getstream/chat/android/state/channel/controller/attachment/UploadAttachmentsIntegrationTests.kt

@@ -262,6 +262,10 @@ internal class MockMessageRepository : MessageRepository {
         TODO("Not yet implemented")
     }
 
+    override suspend fun evictMessages() {
+        TODO("Not yet implemented")
+    }
+
     override suspend fun clear() {
         messages.clear()
     }