jarno
/
element-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Fix notif badge for space invite
This commit is contained in:
Benoit Marty 2021-09-24 16:20:11 +02:00 committed by GitHub
parent 8f4609e72b ee59fe660f
commit 5a8e789435
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/4059.bugfix Normal file
View File

@ -0,0 +1 @@
Space Invites are not lighting up the drawer menu

25
vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.kt
View File

@ -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.RoomSortOrder
import org.matrix.android.sdk.api.session.room.model.Membership 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.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.api.session.room.summary.RoomAggregateNotificationCount
import org.matrix.android.sdk.rx.asObservable import org.matrix.android.sdk.rx.asObservable
import java.util.concurrent.TimeUnit import java.util.concurrent.TimeUnit
@ -143,6 +144,17 @@ class UnreadMessagesSharedViewModel @AssistedInject constructor(@Assisted initia
roomSummaryQueryParams { this.memberships = listOf(Membership.INVITE) } roomSummaryQueryParams { this.memberships = listOf(Membership.INVITE) }
).size ).size
} }
val spaceInviteCount = if (autoAcceptInvites.hideInvites) {
0
} else {
session.getRoomSummaries(
spaceSummaryQueryParams {
this.memberships = listOf(Membership.INVITE)
}
).size
}
val totalCount = session.getNotificationCountForRooms( val totalCount = session.getNotificationCountForRooms(
roomSummaryQueryParams { roomSummaryQueryParams {
this.memberships = listOf(Membership.JOIN) this.memberships = listOf(Membership.JOIN)
@ -161,15 +173,16 @@ class UnreadMessagesSharedViewModel @AssistedInject constructor(@Assisted initia
// filter out current selection // filter out current selection
it.roomId != selectedSpace it.roomId != selectedSpace
} }
CountInfo( CountInfo(
homeCount = counts, homeCount = counts,
otherCount = RoomAggregateNotificationCount( otherCount = RoomAggregateNotificationCount(
rootCounts.fold(0, { acc, rs -> notificationCount = rootCounts.fold(0, { acc, rs -> acc + rs.notificationCount })
acc + rs.notificationCount + (counts.notificationCount.takeIf { selectedSpace != null } ?: 0)
}) + (counts.notificationCount.takeIf { selectedSpace != null } ?: 0), + spaceInviteCount,
rootCounts.fold(0, { acc, rs -> highlightCount = rootCounts.fold(0, { acc, rs -> acc + rs.highlightCount })
acc + rs.highlightCount + (counts.highlightCount.takeIf { selectedSpace != null } ?: 0)
}) + (counts.highlightCount.takeIf { selectedSpace != null } ?: 0) + spaceInviteCount
) )
) )
} }