felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-04-23 10:02:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add the badge value for Home tab bar item.

Browse Source 
Fix the missed discussion count
This commit is contained in:
Giom Foret
2017-04-18 15:55:51 +02:00
parent b110517ec6
commit f8141d5c27
7 changed files with 132 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/ViewController/RoomViewController.m
+25 -14
View File
@@ -90,6 +90,8 @@
#import "RoomEncryptedDataBubbleCell.h"
#import "EncryptionInfoView.h"
#import "MXRoom+Riot.h"
@interface RoomViewController ()
{
// The expanded header
@@ -149,8 +151,8 @@
id kMXCallManagerConferenceStartedObserver;
id kMXCallManagerConferenceFinishedObserver;
// Observer kMXKRoomDataSourceMetaDataChanged to keep updated the missed discussion count
id kMXKRoomDataSourceMetaDataChangedObserver;
// Observer kMXRoomSummaryDidChangeNotification to keep updated the missed discussion count
id mxRoomSummaryDidChangeObserver;
}
@end
@@ -466,7 +468,7 @@
[self refreshActivitiesViewDisplay];
// Observe missed notifications
kMXKRoomDataSourceMetaDataChangedObserver = [[NSNotificationCenter defaultCenter] addObserverForName:kMXKRoomDataSourceMetaDataChanged object:nil queue:[NSOperationQueue mainQueue] usingBlock:^(NSNotification *notif) {
mxRoomSummaryDidChangeObserver = [[NSNotificationCenter defaultCenter] addObserverForName:kMXRoomSummaryDidChangeNotification object:nil queue:[NSOperationQueue mainQueue] usingBlock:^(NSNotification *notif) {
[self refreshMissedDiscussionsCount:NO];
@@ -514,10 +516,10 @@
kAppDelegateNetworkStatusDidChangeNotificationObserver = nil;
}
if (kMXKRoomDataSourceMetaDataChangedObserver)
if (mxRoomSummaryDidChangeObserver)
{
[[NSNotificationCenter defaultCenter] removeObserver:kMXKRoomDataSourceMetaDataChangedObserver];
kMXKRoomDataSourceMetaDataChangedObserver = nil;
[[NSNotificationCenter defaultCenter] removeObserver:mxRoomSummaryDidChangeObserver];
mxRoomSummaryDidChangeObserver = nil;
}
}
@@ -931,10 +933,10 @@
[[NSNotificationCenter defaultCenter] removeObserver:kAppDelegateNetworkStatusDidChangeNotificationObserver];
kAppDelegateNetworkStatusDidChangeNotificationObserver = nil;
}
if (kMXKRoomDataSourceMetaDataChangedObserver)
if (mxRoomSummaryDidChangeObserver)
{
[[NSNotificationCenter defaultCenter] removeObserver:kMXKRoomDataSourceMetaDataChangedObserver];
kMXKRoomDataSourceMetaDataChangedObserver = nil;
[[NSNotificationCenter defaultCenter] removeObserver:mxRoomSummaryDidChangeObserver];
mxRoomSummaryDidChangeObserver = nil;
}
[self removeCallNotificationsListeners];
@@ -2940,18 +2942,27 @@
}
NSUInteger highlightCount = 0;
NSUInteger missedCount = [MXKRoomDataSourceManager missedDiscussionsCount];
if (missedCount && self.roomDataSource.notificationCount)
NSUInteger missedCount = [[AppDelegate theDelegate].masterTabBarController missedDiscussionsCount];
// Compute the missed notifications count of the current room by considering its notification mode in Riot.
NSUInteger roomNotificationCount = self.roomDataSource.room.summary.notificationCount;
if (self.roomDataSource.room.isMentionsOnly)
{
// Only the highlighted missed messages must be considered here.
roomNotificationCount = self.roomDataSource.room.summary.highlightCount;
}
// Remove the current room from the missed discussion counter.
if (missedCount && roomNotificationCount)
{
// Remove the current room from the missed discussion counter
missedCount--;
}
if (missedCount)
{
// Compute the missed highlight count
highlightCount = [MXKRoomDataSourceManager missedHighlightDiscussionsCount];
if (highlightCount && self.roomDataSource.highlightCount)
highlightCount = [[AppDelegate theDelegate].masterTabBarController missedHighlightDiscussionsCount];
if (highlightCount && self.roomDataSource.room.summary.highlightCount)
{
// Remove the current room from the missed highlight counter
highlightCount--;