Merge pull request #4061 from vector-im/feature/bca/spaces_invite_not…

…ification_dot Fix notif badge for space invite
element-hq · Sep 24, 2021 · 5a8e789 · 5a8e789
2 parents 8f4609e + ee59fe6
commit 5a8e789
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 6 deletions.
diff --git a/changelog.d/4059.bugfix b/changelog.d/4059.bugfix
@@ -0,0 +1 @@
+Space Invites are not lighting up the drawer menu
diff --git a/vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.kt b/vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.kt
@@ -38,6 +38,7 @@ import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.room.RoomSortOrder
 import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.roomSummaryQueryParams
+import org.matrix.android.sdk.api.session.room.spaceSummaryQueryParams
 import org.matrix.android.sdk.api.session.room.summary.RoomAggregateNotificationCount
 import org.matrix.android.sdk.rx.asObservable
 import java.util.concurrent.TimeUnit
@@ -143,6 +144,17 @@ class UnreadMessagesSharedViewModel @AssistedInject constructor(@Assisted initia
                                         roomSummaryQueryParams { this.memberships = listOf(Membership.INVITE) }
                                 ).size
                             }
+
+                            val spaceInviteCount = if (autoAcceptInvites.hideInvites) {
+                                0
+                            } else {
+                                session.getRoomSummaries(
+                                        spaceSummaryQueryParams {
+                                            this.memberships = listOf(Membership.INVITE)
+                                        }
+                                ).size
+                            }
+
                             val totalCount = session.getNotificationCountForRooms(
                                     roomSummaryQueryParams {
                                         this.memberships = listOf(Membership.JOIN)
@@ -161,15 +173,16 @@ class UnreadMessagesSharedViewModel @AssistedInject constructor(@Assisted initia
                                         // filter out current selection
                                         it.roomId != selectedSpace
                                     }
+
                             CountInfo(
                                     homeCount = counts,
                                     otherCount = RoomAggregateNotificationCount(
-                                            rootCounts.fold(0, { acc, rs ->
-                                                acc + rs.notificationCount
-                                            }) + (counts.notificationCount.takeIf { selectedSpace != null } ?: 0),
-                                            rootCounts.fold(0, { acc, rs ->
-                                                acc + rs.highlightCount
-                                            }) + (counts.highlightCount.takeIf { selectedSpace != null } ?: 0)
+                                            notificationCount = rootCounts.fold(0, { acc, rs -> acc + rs.notificationCount })
+                                                    + (counts.notificationCount.takeIf { selectedSpace != null } ?: 0)
+                                                    + spaceInviteCount,
+                                            highlightCount = rootCounts.fold(0, { acc, rs -> acc + rs.highlightCount })
+                                                    + (counts.highlightCount.takeIf { selectedSpace != null } ?: 0)
+                                                    + spaceInviteCount
                                     )
                             )
                         }
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Space Invites are not lighting up the drawer menu