Change ActivityData.update to avoid overwriting feed capabilities

Author: gpunto

stream-feeds-android-client/src/main/kotlin/io/getstream/feeds/android/client/internal/model/ActivityOperations.kt

@@ -79,9 +79,9 @@ internal fun ActivityResponse.Visibility.toModel(): ActivityDataVisibility =
     }
 
 /**
- * Extension function to update the activity while preserving own bookmarks, reactions, and poll
- * votes because "own" data from WS events is not reliable. Optionally, different instances can be
- * provided to be used instead of the current ones.
+ * Extension function to update the activity while preserving own bookmarks, reactions, poll votes,
+ * and feed capabilities because "own" data from WS events is not reliable. Optionally, different
+ * instances can be provided to be used instead of the current ones.
  */
 internal fun ActivityData.update(
     updated: ActivityData,
@@ -92,6 +92,7 @@ internal fun ActivityData.update(
         ownBookmarks = ownBookmarks,
         ownReactions = ownReactions,
         poll = updated.poll?.let { poll?.update(it) ?: it },
+        currentFeed = updated.currentFeed?.let { currentFeed?.update(it) ?: it },
     )
 
 /**

stream-feeds-android-client/src/test/kotlin/io/getstream/feeds/android/client/internal/state/ActivityStateImplTest.kt

@@ -22,9 +22,11 @@ import io.getstream.feeds.android.client.api.state.ActivityCommentListState
 import io.getstream.feeds.android.client.internal.test.TestData.activityData
 import io.getstream.feeds.android.client.internal.test.TestData.bookmarkData
 import io.getstream.feeds.android.client.internal.test.TestData.commentData
+import io.getstream.feeds.android.client.internal.test.TestData.feedData
 import io.getstream.feeds.android.client.internal.test.TestData.feedsReactionData
 import io.getstream.feeds.android.client.internal.test.TestData.pollData
 import io.getstream.feeds.android.client.internal.test.TestData.pollVoteData
+import io.getstream.feeds.android.network.models.FeedOwnCapability
 import io.mockk.mockk
 import kotlinx.coroutines.test.runTest
 import org.junit.Assert.assertEquals
@@ -130,33 +132,41 @@ internal class ActivityStateImplTest {
         val initialReaction = feedsReactionData("activity-1", "like", currentUserId)
         val ownVote = pollVoteData("vote-1", "poll-1", "option-1", currentUserId)
         val initialPoll = pollData("poll-1", "Test Poll", ownVotes = listOf(ownVote))
+        val initialCapabilities = setOf(FeedOwnCapability.ReadFeed, FeedOwnCapability.AddActivity)
+        val initialFeed =
+            feedData(id = "1", groupId = "user", ownCapabilities = initialCapabilities)
         val initialActivity =
             activityData(
                 "activity-1",
                 text = "Original",
                 poll = initialPoll,
                 ownBookmarks = listOf(initialBookmark),
                 ownReactions = listOf(initialReaction),
+                currentFeed = initialFeed,
             )
         // Backend sends update with empty "own" properties
         val updatedPoll = pollData("poll-1", "Updated Poll", ownVotes = emptyList())
+        val updatedFeed = feedData(id = "1", groupId = "user", ownCapabilities = emptySet())
         val updatedActivity =
             activityData(
                 "activity-1",
                 text = "Updated",
                 poll = updatedPoll,
                 ownBookmarks = emptyList(),
                 ownReactions = emptyList(),
+                currentFeed = updatedFeed,
             )
         setupAndUpdateActivity(initialActivity, updatedActivity)
 
         // Verify all "own" properties are preserved
         val expectedPoll = updatedPoll.copy(ownVotes = listOf(ownVote))
+        val expectedFeed = updatedFeed.copy(ownCapabilities = initialCapabilities)
         val expectedActivity =
             updatedActivity.copy(
                 poll = expectedPoll,
                 ownBookmarks = listOf(initialBookmark),
                 ownReactions = listOf(initialReaction),
+                currentFeed = expectedFeed,
             )
         expectActivityAndPoll(expectedActivity, expectedPoll)
     }

stream-feeds-android-client/src/test/kotlin/io/getstream/feeds/android/client/internal/state/FeedStateImplTest.kt

@@ -180,35 +180,43 @@ internal class FeedStateImplTest {
         val initialReaction = feedsReactionData("activity-1", "like", currentUserId)
         val ownVote = pollVoteData("vote-1", "poll-1", "option-1", currentUserId)
         val initialPoll = pollData("poll-1", "Test Poll", ownVotes = listOf(ownVote))
+        val initialCapabilities = setOf(FeedOwnCapability.ReadFeed, FeedOwnCapability.AddActivity)
+        val initialFeed =
+            feedData(id = "1", groupId = "user", ownCapabilities = initialCapabilities)
         val initialActivity =
             activityData(
                 "activity-1",
                 text = "Original",
                 poll = initialPoll,
                 ownBookmarks = listOf(initialBookmark),
                 ownReactions = listOf(initialReaction),
+                currentFeed = initialFeed,
             )
         setupInitialState(listOf(initialActivity))
 
         // Backend sends update with empty "own" properties
         val updatedPoll = pollData("poll-1", "Updated Poll", ownVotes = emptyList())
+        val updatedFeed = feedData(id = "1", groupId = "user", ownCapabilities = emptySet())
         val updatedActivity =
             activityData(
                 "activity-1",
                 text = "Updated",
                 poll = updatedPoll,
                 ownBookmarks = emptyList(),
                 ownReactions = emptyList(),
+                currentFeed = updatedFeed,
             )
         feedState.onActivityUpdated(updatedActivity)
 
         // Verify all "own" properties are preserved
         val expectedPoll = updatedPoll.copy(ownVotes = listOf(ownVote))
+        val expectedFeed = updatedFeed.copy(ownCapabilities = initialCapabilities)
         val expectedActivity =
             updatedActivity.copy(
                 poll = expectedPoll,
                 ownBookmarks = listOf(initialBookmark),
                 ownReactions = listOf(initialReaction),
+                currentFeed = expectedFeed,
             )
         assertEquals(listOf(expectedActivity), feedState.activities.value)
     }