Address PR comments

Author: stefanceriu

ElementX/Sources/Screens/RoomDetailsScreen/RoomDetailsScreenModels.swift

@@ -38,8 +38,8 @@ struct DMRecipientInfo {
 struct RoomDetailsScreenViewState: BindableState {
     var details: RoomDetails
 
-    let isEncrypted: Bool
-    let isDirect: Bool
+    var isEncrypted: Bool
+    var isDirect: Bool
     var permalink: URL?
 
     var topic: AttributedString?

ElementX/Sources/Screens/RoomDetailsScreen/RoomDetailsScreenViewModel.swift

@@ -208,13 +208,18 @@ class RoomDetailsScreenViewModel: RoomDetailsScreenViewModelType, RoomDetailsScr
     }
 
     private func updateRoomInfo(_ roomInfo: RoomInfoProxy) {
+        state.isEncrypted = roomInfo.isEncrypted
+        state.isDirect = roomInfo.isDirect
+        state.bindings.isFavourite = roomInfo.isFavourite
+        
+        state.joinedMembersCount = roomInfo.joinedMembersCount
+        
         state.details = roomProxy.details
 
         let topic = attributedStringBuilder.fromPlain(roomInfo.topic)
         state.topic = topic
         state.topicSummary = topic?.unattributedStringByReplacingNewlinesWithSpaces()
-        state.joinedMembersCount = roomInfo.joinedMembersCount
-        state.bindings.isFavourite = roomInfo.isFavourite
+        
         switch roomInfo.joinRule {
         case .knock, .knockRestricted:
             state.isKnockableRoom = true

ElementX/Sources/Screens/RoomScreen/ComposerToolbar/ComposerToolbarModels.swift

@@ -73,7 +73,7 @@ struct ComposerToolbarViewState: BindableState {
     var audioPlayerState: AudioPlayerState
     var audioRecorderState: AudioRecorderState
 
-    let isRoomEncrypted: Bool
+    var isRoomEncrypted: Bool
 
     var bindings: ComposerToolbarViewStateBindings
 

ElementX/Sources/Screens/RoomScreen/ComposerToolbar/ComposerToolbarViewModel.swift

@@ -62,13 +62,17 @@ final class ComposerToolbarViewModel: ComposerToolbarViewModelType, ComposerTool
         mentionBuilder = MentionBuilder()
         attributedStringBuilder = AttributedStringBuilder(cacheKey: "Composer", mentionBuilder: mentionBuilder)
 
-        super.init(initialViewState: ComposerToolbarViewState(audioPlayerState: .init(id: .recorderPreview,
-                                                                                      title: L10n.commonVoiceMessage,
-                                                                                      duration: 0),
+        super.init(initialViewState: ComposerToolbarViewState(audioPlayerState: .init(id: .recorderPreview, title: L10n.commonVoiceMessage, duration: 0),
                                                               audioRecorderState: .init(),
                                                               isRoomEncrypted: roomProxy.infoPublisher.value.isEncrypted,
                                                               bindings: .init()),
                    mediaProvider: mediaProvider)
+        
+        roomProxy.infoPublisher
+            .map(\.isEncrypted)
+            .receive(on: DispatchQueue.main)
+            .weakAssign(to: \.state.isRoomEncrypted, on: self)
+            .store(in: &cancellables)
 
         context.$viewState
             .map(\.composerMode)

ElementX/Sources/Services/Room/RoomInfoProxy.swift

@@ -42,7 +42,11 @@ struct RoomInfoProxy: BaseRoomInfoProxyProtocol {
         return .room(id: id, name: displayName, avatarURL: avatarURL)
     }
 
+    // Here we're assuming unknown rooms are unencrypted.
+    // Fortunately https://github.com/matrix-org/matrix-rust-sdk/pull/4778 makes that very much of an edge case and we
+    // also automatically start a `latestEncryptionState` fetch if needed.
     var isEncrypted: Bool { roomInfo.encryptionState == .encrypted }
+    
     var isDirect: Bool { roomInfo.isDirect }
     var isPublic: Bool { roomInfo.isPublic }
     var isSpace: Bool { roomInfo.isSpace }