From 389eb1f2b53beb40fa40fb19a048df2dd8aa91b6 Mon Sep 17 00:00:00 2001
From: Doug <6060466+pixlwave@users.noreply.github.com>
Date: Thu, 16 Feb 2023 16:06:15 +0000
Subject: [PATCH] Add required state on subscribe. (#589)

---
 ElementX/Sources/Other/Logging/RustTracing.swift | 4 +++-
 ElementX/Sources/Services/Room/RoomProxy.swift   | 5 ++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ElementX/Sources/Other/Logging/RustTracing.swift b/ElementX/Sources/Other/Logging/RustTracing.swift
index c7b0be381..4634b0e9e 100644
--- a/ElementX/Sources/Other/Logging/RustTracing.swift
+++ b/ElementX/Sources/Other/Logging/RustTracing.swift
@@ -38,6 +38,7 @@ struct TracingConfiguration {
         case matrix_sdk_ffi_uniffi_api = "matrix_sdk_ffi::uniffi_api"
         case matrix_sdk_sliding_sync = "matrix_sdk::sliding_sync"
         case matrix_sdk_base_sliding_sync = "matrix_sdk_base::sliding_sync"
+        case matrix_sdk_room_timeline = "matrix_sdk::room::timeline"
     }
     
     let targets: OrderedDictionary<Target, LogLevel> = [
@@ -48,7 +49,8 @@ struct TracingConfiguration {
         .matrix_sdk_crypto: .debug,
         .matrix_sdk_http_client: .debug,
         .matrix_sdk_sliding_sync: .trace,
-        .matrix_sdk_base_sliding_sync: .trace
+        .matrix_sdk_base_sliding_sync: .trace,
+        .matrix_sdk_room_timeline: .info
     ]
     
     var overrides = [Target: LogLevel]()
diff --git a/ElementX/Sources/Services/Room/RoomProxy.swift b/ElementX/Sources/Services/Room/RoomProxy.swift
index 88e9119fc..8aaa7d296 100644
--- a/ElementX/Sources/Services/Room/RoomProxy.swift
+++ b/ElementX/Sources/Services/Room/RoomProxy.swift
@@ -137,7 +137,10 @@ class RoomProxy: RoomProxyProtocol {
     }
         
     func addTimelineListener(listener: TimelineListener) -> Result<Void, RoomProxyError> {
-        if let token = slidingSyncRoom.subscribeAndAddTimelineListener(listener: listener, settings: nil) {
+        let settings = RoomSubscription(requiredState: [RequiredState(key: "m.room.topic", value: ""),
+                                                        RequiredState(key: "m.room.canonical_alias", value: "")],
+                                        timelineLimit: nil)
+        if let token = slidingSyncRoom.subscribeAndAddTimelineListener(listener: listener, settings: settings) {
             timelineObservationToken = token
             Task {
                 await fetchMembers()