Merge pull request #451 from tchapgouv/phlpro/445

The displayed room type is wrong for the unrestricted rooms
tchapgouv · Feb 24, 2022 · 654f07a · 654f07a
2 parents 3f49c98 + f36c9e9
commit 654f07a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/Riot/Utils/EventFormatter.m b/Riot/Utils/EventFormatter.m
@@ -413,6 +413,9 @@ - (BOOL)session:(MXSession *)session updateRoomSummary:(MXRoomSummary *)summary
 {
     BOOL updated = [super session:session updateRoomSummary:summary withStateEvents:stateEvents roomState:roomState];
 
+    // Store in the room summary some additional information
+    updated |= [summary tc_updateWithStateEvents:stateEvents];
+
     // Customisation for EMS Functional Members in direct rooms
     if (BuildSettings.supportFunctionalMembers && summary.room.isDirect)
     {

diff --git a/Tchap/Extensions/MXRoomSummary.swift b/Tchap/Extensions/MXRoomSummary.swift
@@ -122,7 +122,7 @@ enum RoomCategory {
 
     /// Get the room category
     @nonobjc func tc_roomCategory() -> RoomCategory {
-        let isJoinRulePublic = self.others["mxkEventFormatterisJoinRulePublic"] as? Bool ?? false
+        let isJoinRulePublic = self.joinRule == kMXRoomJoinRulePublic
         let category: RoomCategory
 
         if tc_isServerNotice() {

diff --git a/changelog.d/445.bugfix b/changelog.d/445.bugfix
@@ -0,0 +1 @@
+Fix rooms statuses in Rooms list