Direct rooms: Fix MXRoomSummary.directUserId implementation

matrix-org · Aug 17, 2018 · 700900a · 700900a
1 parent e3668f8
commit 700900a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/MatrixSDK/Data/MXRoomSummary.m b/MatrixSDK/Data/MXRoomSummary.m
@@ -374,9 +374,14 @@ - (NSUInteger)localUnreadEventCount
     return [_mxSession.store localUnreadEventCount:_roomId withTypeIn:_mxSession.unreadEventTypes];
 }
 
+- (NSString *)directUserId
+{
+    return self.room.directUserId;
+}
+
 - (BOOL)isDirect
 {
-    return (_directUserId != nil);
+    return (self.directUserId != nil);
 }
 
 - (void)markAllAsRead
@@ -540,7 +545,6 @@ - (instancetype)initWithCoder:(NSCoder *)aDecoder
         _isEncrypted = [aDecoder decodeBoolForKey:@"isEncrypted"];
         _notificationCount = (NSUInteger)[aDecoder decodeIntegerForKey:@"notificationCount"];
         _highlightCount = (NSUInteger)[aDecoder decodeIntegerForKey:@"highlightCount"];
-        _directUserId = [aDecoder decodeObjectForKey:@"directUserId"];
 
         _lastMessageEventId = [aDecoder decodeObjectForKey:@"lastMessageEventId"];
         _lastMessageOriginServerTs = [aDecoder decodeInt64ForKey:@"lastMessageOriginServerTs"];
@@ -582,7 +586,6 @@ - (void)encodeWithCoder:(NSCoder *)aCoder
     [aCoder encodeBool:_isEncrypted forKey:@"isEncrypted"];
     [aCoder encodeInteger:(NSInteger)_notificationCount forKey:@"notificationCount"];
     [aCoder encodeInteger:(NSInteger)_highlightCount forKey:@"highlightCount"];
-    [aCoder encodeObject:[self room].directUserId forKey:@"directUserId"];
 
     // Store last message metadata
     [aCoder encodeObject:_lastMessageEventId forKey:@"lastMessageEventId"];

diff --git a/MatrixSDK/Data/Store/MXFileStore/MXFileStore.m b/MatrixSDK/Data/Store/MXFileStore/MXFileStore.m
@@ -25,7 +25,7 @@
 #import "MXSDKOptions.h"
 #import "MXTools.h"
 
-static NSUInteger const kMXFileVersion = 56;
+static NSUInteger const kMXFileVersion = 57;
 
 static NSString *const kMXFileStoreFolder = @"MXFileStore";
 static NSString *const kMXFileStoreMedaDataFile = @"MXFileStore";