Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix returning old data for some properties of MXRoomState #355

Merged
merged 1 commit into from
Aug 21, 2017
Merged

Fix returning old data for some properties of MXRoomState #355

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions MatrixSDK/Data/MXRoomState.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ - (NSString*)canonicalAlias
NSString *canonicalAlias;

// Check it from the state events
MXEvent *event = [stateEvents objectForKey:kMXEventTypeStringRoomCanonicalAlias].firstObject;
MXEvent *event = [stateEvents objectForKey:kMXEventTypeStringRoomCanonicalAlias].lastObject;
if (event && [self contentOfEvent:event])
{
MXJSONModelSetString(canonicalAlias, [self contentOfEvent:event][@"alias"]);
Expand All @@ -245,7 +245,7 @@ - (NSString *)name
NSString *name;

// Check it from the state events
MXEvent *event = [stateEvents objectForKey:kMXEventTypeStringRoomName].firstObject;
MXEvent *event = [stateEvents objectForKey:kMXEventTypeStringRoomName].lastObject;
if (event && [self contentOfEvent:event])
{
MXJSONModelSetString(name, [self contentOfEvent:event][@"name"]);
Expand All @@ -259,7 +259,7 @@ - (NSString *)topic
NSString *topic;

// Check it from the state events
MXEvent *event = [stateEvents objectForKey:kMXEventTypeStringRoomTopic].firstObject;
MXEvent *event = [stateEvents objectForKey:kMXEventTypeStringRoomTopic].lastObject;
if (event && [self contentOfEvent:event])
{
MXJSONModelSetString(topic, [self contentOfEvent:event][@"topic"]);
Expand All @@ -273,7 +273,7 @@ - (NSString *)avatar
NSString *avatar;

// Check it from the state events
MXEvent *event = [stateEvents objectForKey:kMXEventTypeStringRoomAvatar].firstObject;
MXEvent *event = [stateEvents objectForKey:kMXEventTypeStringRoomAvatar].lastObject;
if (event && [self contentOfEvent:event])
{
MXJSONModelSetString(avatar, [self contentOfEvent:event][@"url"]);
Expand All @@ -287,7 +287,7 @@ - (MXRoomHistoryVisibility)historyVisibility
MXRoomHistoryVisibility historyVisibility = kMXRoomHistoryVisibilityShared;

// Check it from the state events
MXEvent *event = [stateEvents objectForKey:kMXEventTypeStringRoomHistoryVisibility].firstObject;
MXEvent *event = [stateEvents objectForKey:kMXEventTypeStringRoomHistoryVisibility].lastObject;
if (event && [self contentOfEvent:event])
{
MXJSONModelSetString(historyVisibility, [self contentOfEvent:event][@"history_visibility"]);
Expand All @@ -301,7 +301,7 @@ - (MXRoomJoinRule)joinRule
MXRoomJoinRule joinRule = kMXRoomJoinRuleInvite;

// Check it from the state events
MXEvent *event = [stateEvents objectForKey:kMXEventTypeStringRoomJoinRules].firstObject;
MXEvent *event = [stateEvents objectForKey:kMXEventTypeStringRoomJoinRules].lastObject;
if (event && [self contentOfEvent:event])
{
MXJSONModelSetString(joinRule, [self contentOfEvent:event][@"join_rule"]);
Expand All @@ -320,7 +320,7 @@ - (MXRoomGuestAccess)guestAccess
MXRoomGuestAccess guestAccess = kMXRoomGuestAccessForbidden;

// Check it from the state events
MXEvent *event = [stateEvents objectForKey:kMXEventTypeStringRoomGuestAccess].firstObject;
MXEvent *event = [stateEvents objectForKey:kMXEventTypeStringRoomGuestAccess].lastObject;
if (event && [self contentOfEvent:event])
{
MXJSONModelSetString(guestAccess, [self contentOfEvent:event][@"guest_access"]);
Expand Down Expand Up @@ -475,7 +475,7 @@ - (BOOL)isEncrypted

- (NSString *)encryptionAlgorithm
{
return stateEvents[kMXEventTypeStringRoomEncryption].firstObject.content[@"algorithm"];
return stateEvents[kMXEventTypeStringRoomEncryption].lastObject.content[@"algorithm"];
}


Expand Down