From 636389d584af76bde2b0983f06d09cf7117e88e1 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Wed, 22 Sep 2021 17:26:36 +0200
Subject: [PATCH 1/2] Fix notif badge for space invite

---
 changelog.d/4059.bugfix                         |  1 +
 .../home/UnreadMessagesSharedViewModel.kt       | 17 ++++++++++++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 changelog.d/4059.bugfix

diff --git a/changelog.d/4059.bugfix b/changelog.d/4059.bugfix
new file mode 100644
index 0000000000..868359ac89
--- /dev/null
+++ b/changelog.d/4059.bugfix
@@ -0,0 +1 @@
+Space Invites are not lighting up the drawer menu
\ No newline at end of file
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
index f02711690a..cd8670a48d 100644
--- 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,18 @@ 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),
+                                            }) + (counts.notificationCount.takeIf { selectedSpace != null } ?: 0)
+                                                    + spaceInviteCount,
                                             rootCounts.fold(0, { acc, rs ->
                                                 acc + rs.highlightCount
                                             }) + (counts.highlightCount.takeIf { selectedSpace != null } ?: 0)
+                                                    + spaceInviteCount
                                     )
                             )
                         }

From ee59fe660fabeaa4ed828ddc112c68f39b1353ec Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 24 Sep 2021 15:53:10 +0200
Subject: [PATCH 2/2] Improve formatting

---
 .../app/features/home/UnreadMessagesSharedViewModel.kt | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

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
index cd8670a48d..ac983a9f0c 100644
--- a/vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.kt
@@ -177,13 +177,11 @@ class UnreadMessagesSharedViewModel @AssistedInject constructor(@Assisted initia
                             CountInfo(
                                     homeCount = counts,
                                     otherCount = RoomAggregateNotificationCount(
-                                            rootCounts.fold(0, { acc, rs ->
-                                                acc + rs.notificationCount
-                                            }) + (counts.notificationCount.takeIf { selectedSpace != null } ?: 0)
+                                            notificationCount = rootCounts.fold(0, { acc, rs -> acc + rs.notificationCount })
+                                                    + (counts.notificationCount.takeIf { selectedSpace != null } ?: 0)
                                                     + spaceInviteCount,
-                                            rootCounts.fold(0, { acc, rs ->
-                                                acc + rs.highlightCount
-                                            }) + (counts.highlightCount.takeIf { selectedSpace != null } ?: 0)
+                                            highlightCount = rootCounts.fold(0, { acc, rs -> acc + rs.highlightCount })
+                                                    + (counts.highlightCount.takeIf { selectedSpace != null } ?: 0)
                                                     + spaceInviteCount
                                     )
                             )