Presence: fix live updates on Home & DM list

Riot/Modules/Common/Recents/Views/RecentTableViewCell.m

@@ -27,6 +27,15 @@
 
 #import "MXRoomSummary+Riot.h"
 
+@interface RecentTableViewCell()
+{
+    /**
+     The observer of the presence for direct user.
+    */
+    id mxDirectUserPresenceObserver;
+}
+@end
+
 @implementation RecentTableViewCell
 
 #pragma mark - Class methods
@@ -48,6 +57,7 @@
     self.lastEventDescription.textColor = ThemeService.shared.theme.textSecondaryColor;
     self.lastEventDate.textColor = ThemeService.shared.theme.textSecondaryColor;
     self.missedNotifAndUnreadBadgeLabel.textColor = ThemeService.shared.theme.baseTextPrimaryColor;
+    self.presenceIndicatorView.borderColor = ThemeService.shared.theme.backgroundColor;
     
     self.roomAvatar.defaultBackgroundColor = [UIColor clearColor];
 }
@@ -128,11 +138,25 @@
                                             roomId:roomCellData.roomIdentifier
                                        displayName:roomCellData.roomDisplayname
                                       mediaManager:roomCellData.mxSession.mediaManager];
-        
-        // Presence indicator
-        self.presenceIndicatorView.borderColor = ThemeService.shared.theme.backgroundColor;
-        self.presenceIndicatorView.presence = roomCellData.presence;
-        self.presenceIndicatorView.hidden = roomCellData.presence == MXPresenceUnknown;
+
+        if (!mxDirectUserPresenceObserver && roomCellData.directUserId)
+        {
+            // Observe contact presence change
+            MXWeakify(self);
+            mxDirectUserPresenceObserver = [[NSNotificationCenter defaultCenter] addObserverForName:kMXKContactManagerMatrixUserPresenceChangeNotification object:nil queue:[NSOperationQueue mainQueue] usingBlock:^(NSNotification *notif) {
+                MXStrongifyAndReturnIfNil(self);
+
+                NSString* directUserId = self->roomCellData.directUserId;
+
+                if (directUserId && [directUserId isEqualToString:notif.object])
+                {
+                    MXPresence presence = [MXTools presence:[notif.userInfo objectForKey:kMXKContactManagerMatrixPresenceKey]];
+                    [self refreshContactPresence:presence];
+                }
+            }];
+
+            [self refreshContactPresence:roomCellData.presence];
+        }
     }
     else
     {
@@ -140,6 +164,12 @@
     }
 }
 
+- (void)refreshContactPresence:(MXPresence)presence
+{
+    self.presenceIndicatorView.presence = presence;
+    self.presenceIndicatorView.hidden = presence == MXPresenceUnknown;
+}
+
 + (CGFloat)heightForCellData:(MXKCellData *)cellData withMaximumWidth:(CGFloat)maxWidth
 {
     // The height is fixed

Riot/Modules/Home/Views/RoomCollectionViewCell.m

@@ -26,6 +26,15 @@
 
 #import "MXTools.h"
 
+@interface RoomCollectionViewCell()
+{
+    /**
+     The observer of the presence for direct user.
+    */
+    id mxDirectUserPresenceObserver;
+}
+@end
+
 @implementation RoomCollectionViewCell
 
 #pragma mark - Class methods
@@ -146,13 +155,34 @@
                                             roomId:roomCellData.roomIdentifier
                                        displayName:roomCellData.roomDisplayname
                                       mediaManager:roomCellData.mxSession.mediaManager];
-        
-        // Presence indicator
-        self.presenceIndicatorView.presence = roomCellData.presence;
-        self.presenceIndicatorView.hidden = roomCellData.presence == MXPresenceUnknown;
+
+        if (!mxDirectUserPresenceObserver && roomCellData.directUserId)
+        {
+            // Observe contact presence change
+            MXWeakify(self);
+            mxDirectUserPresenceObserver = [[NSNotificationCenter defaultCenter] addObserverForName:kMXKContactManagerMatrixUserPresenceChangeNotification object:nil queue:[NSOperationQueue mainQueue] usingBlock:^(NSNotification *notif) {
+                MXStrongifyAndReturnIfNil(self);
+
+                NSString* directUserId = self->roomCellData.directUserId;
+
+                if (directUserId && [directUserId isEqualToString:notif.object])
+                {
+                    MXPresence presence = [MXTools presence:[notif.userInfo objectForKey:kMXKContactManagerMatrixPresenceKey]];
+                    [self refreshContactPresence:presence];
+                }
+            }];
+
+            [self refreshContactPresence:roomCellData.presence];
+        }
     }
 }
 
+- (void)refreshContactPresence:(MXPresence)presence
+{
+    self.presenceIndicatorView.presence = presence;
+    self.presenceIndicatorView.hidden = presence == MXPresenceUnknown;
+}
+
 - (MXKCellData*)renderedCellData
 {
     return roomCellData;

Riot/Modules/MatrixKit/Models/RoomList/MXKRecentCellData.m

@@ -93,6 +93,11 @@
     return roomSummary.avatar;
 }
 
+- (NSString *)directUserId
+{
+    return self.roomSummary.directUserId;
+}
+
 - (MXPresence)presence
 {
     if (self.roomSummary.isDirect)

Riot/Modules/MatrixKit/Models/RoomList/MXKRecentCellDataStoring.h

@@ -44,6 +44,7 @@
 @property (nonatomic, readonly) NSString *roomIdentifier;
 @property (nonatomic, readonly) NSString *roomDisplayname;
 @property (nonatomic, readonly) NSString *avatarUrl;
+@property (nonatomic, readonly) NSString *directUserId;
 @property (nonatomic, readonly) MXPresence presence;
 @property (nonatomic, readonly) NSString *lastEventTextMessage;
 @property (nonatomic, readonly) NSString *lastEventDate;

changelog.d/6144.bugfix

@@ -0,0 +1 @@
+Presence: fix live updates on Home & DM list