From cdbb657961c4cad2153075144ff0fc3f3784b9b4 Mon Sep 17 00:00:00 2001 From: Christopher Rossbach <31703168+duncanturk@users.noreply.github.com> Date: Fri, 27 Mar 2020 14:24:42 +0100 Subject: [PATCH 1/3] Fix #957 by incrementing the catchup count on home icon. Signed-off-by: Christopher Rossbach <31703168+duncanturk@users.noreply.github.com> --- .../vector/riotx/features/home/HomeDetailViewModel.kt | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/vector/src/main/java/im/vector/riotx/features/home/HomeDetailViewModel.kt b/vector/src/main/java/im/vector/riotx/features/home/HomeDetailViewModel.kt index 6b322a2b48..3824ba7922 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/HomeDetailViewModel.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/HomeDetailViewModel.kt @@ -22,6 +22,7 @@ import com.airbnb.mvrx.ViewModelContext import com.squareup.inject.assisted.Assisted import com.squareup.inject.assisted.AssistedInject import im.vector.matrix.android.api.session.Session +import im.vector.matrix.android.api.session.room.model.Membership import im.vector.matrix.rx.rx import im.vector.riotx.core.di.HasScreenInjector import im.vector.riotx.core.platform.EmptyViewEvents @@ -116,10 +117,14 @@ class HomeDetailViewModel @AssistedInject constructor(@Assisted initialState: Ho .observeOn(Schedulers.computation()) .map { it.asSequence() } .subscribe { summaries -> + val invites = summaries + .filter { it.membership == Membership.INVITE } + .count() + val peopleNotifications = summaries .filter { it.isDirect } .map { it.notificationCount } - .sumBy { i -> i } + .sum() val peopleHasHighlight = summaries .filter { it.isDirect } .any { it.highlightCount > 0 } @@ -127,14 +132,14 @@ class HomeDetailViewModel @AssistedInject constructor(@Assisted initialState: Ho val roomsNotifications = summaries .filter { !it.isDirect } .map { it.notificationCount } - .sumBy { i -> i } + .sum() val roomsHasHighlight = summaries .filter { !it.isDirect } .any { it.highlightCount > 0 } setState { copy( - notificationCountCatchup = peopleNotifications + roomsNotifications, + notificationCountCatchup = peopleNotifications + roomsNotifications + invites, notificationHighlightCatchup = peopleHasHighlight || roomsHasHighlight, notificationCountPeople = peopleNotifications, notificationHighlightPeople = peopleHasHighlight, From dff89cb2e198e94c6d8d5b514af26d270b58a095 Mon Sep 17 00:00:00 2001 From: Christopher Rossbach <31703168+duncanturk@users.noreply.github.com> Date: Fri, 27 Mar 2020 14:41:48 +0100 Subject: [PATCH 2/3] document changes Signed-off-by: Christopher Rossbach <31703168+duncanturk@users.noreply.github.com> --- CHANGES.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGES.md b/CHANGES.md index 0b9d8d5991..739cbb9152 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -9,6 +9,7 @@ Improvements 🙌: - Verification DM / Handle concurrent .start after .ready (#794) - CrossSigning / Update Shield Logic for DM (#963) - Xsigning | Complete security new session design update (#1135) + - UX/UI | Add indicator to home tab on invite (#957) Bugfix 🐛: - Missing avatar/displayname after verification request message (#841) From 5521c094f7085ad098641d14b0449eb5fee008be Mon Sep 17 00:00:00 2001 From: Christopher Rossbach <31703168+duncanturk@users.noreply.github.com> Date: Tue, 7 Apr 2020 17:50:01 +0200 Subject: [PATCH 3/3] fix typing difference --- CHANGES.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index c8fe91cdcd..89a8f3db07 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -9,7 +9,7 @@ Features ✨: Improvements 🙌: - Verification DM / Handle concurrent .start after .ready (#794) - Cross-Signing | Update Shield Logic for DM (#963) - - Cross-signing | Complete security new session design update (#1135) + - Cross-Signing | Complete security new session design update (#1135) - UX/UI | Add indicator to home tab on invite (#957)