From ad1422ad6cd165aee2694d24de67ebec23920b38 Mon Sep 17 00:00:00 2001
From: Mauro Romito <mauro.romito@element.io>
Date: Tue, 18 Jul 2023 17:14:53 +0200
Subject: [PATCH] sdk bump

---
 ElementX.xcodeproj/project.pbxproj                       | 4 ++--
 .../xcshareddata/swiftpm/Package.resolved                | 4 ++--
 .../RoomScreen/View/TimelineTableViewController.swift    | 9 ++++-----
 ElementX/Sources/Services/Room/RoomProxy.swift           | 4 ++--
 project.yml                                              | 2 +-
 5 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/ElementX.xcodeproj/project.pbxproj b/ElementX.xcodeproj/project.pbxproj
index b46f798f5e..4a7891ed2e 100644
--- a/ElementX.xcodeproj/project.pbxproj
+++ b/ElementX.xcodeproj/project.pbxproj
@@ -3618,7 +3618,7 @@
 			path = Timeline;
 			sourceTree = "<group>";
 		};
-		"TEMP_DD7E56C3-C054-403A-942D-AAD3ACD56CFE" /* element-x-ios */ = {
+		"TEMP_F9C0D387-4F2A-4721-B83D-6CECB81A6B6F" /* element-x-ios */ = {
 			isa = PBXGroup;
 			children = (
 				41553551C55AD59885840F0E /* secrets.xcconfig */,
@@ -5327,7 +5327,7 @@
 			repositoryURL = "https://github.com/matrix-org/matrix-rust-components-swift";
 			requirement = {
 				kind = exactVersion;
-				version = "1.0.100-alpha";
+				version = "1.0.101-alpha";
 			};
 		};
 		96495DD8554E2F39D3954354 /* XCRemoteSwiftPackageReference "posthog-ios" */ = {
diff --git a/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
index abbc29ae89..c6e19f3cf4 100644
--- a/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
+++ b/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -111,8 +111,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/matrix-org/matrix-rust-components-swift",
       "state" : {
-        "revision" : "519bb8ed790646b73b63b8af125a65ed5be0465c",
-        "version" : "1.0.100-alpha"
+        "revision" : "ac6472d2f05128f05345e657e41267dbc0f06f7c",
+        "version" : "1.0.101-alpha"
       }
     },
     {
diff --git a/ElementX/Sources/Screens/RoomScreen/View/TimelineTableViewController.swift b/ElementX/Sources/Screens/RoomScreen/View/TimelineTableViewController.swift
index dd5c40c96b..b0b38dacf2 100644
--- a/ElementX/Sources/Screens/RoomScreen/View/TimelineTableViewController.swift
+++ b/ElementX/Sources/Screens/RoomScreen/View/TimelineTableViewController.swift
@@ -157,6 +157,10 @@ class TimelineTableViewController: UIViewController {
                 self.scrollToBottom(animated: false) // Force the bottom to be visible as some timelines misbehave.
             }
             .store(in: &cancellables)
+
+        ServiceLocator.shared.settings.$timelineDiffableAnimationsEnabled
+            .weakAssign(to: \.shouldAnimate, on: self)
+            .store(in: &cancellables)
         
         configureDataSource()
     }
@@ -170,11 +174,6 @@ class TimelineTableViewController: UIViewController {
         guard !hasAppearedOnce else { return }
         scrollToBottom(animated: false)
         hasAppearedOnce = true
-        // This is to prevent the SS proxy issue that forces a full refresh of all the timeline items
-        // the first time the timeline is opened
-        DispatchQueue.main.asyncAfter(deadline: .now() + 2) {
-            self.shouldAnimate = ServiceLocator.shared.settings.timelineDiffableAnimationsEnabled
-        }
     }
     
     override func didMove(toParent parent: UIViewController?) {
diff --git a/ElementX/Sources/Services/Room/RoomProxy.swift b/ElementX/Sources/Services/Room/RoomProxy.swift
index 32abf141c0..ddf7da9a4c 100644
--- a/ElementX/Sources/Services/Room/RoomProxy.swift
+++ b/ElementX/Sources/Services/Room/RoomProxy.swift
@@ -563,7 +563,7 @@ class RoomProxy: RoomProxyProtocol {
     func rejectInvitation() async -> Result<Void, RoomProxyError> {
         await Task.dispatch(on: .global()) {
             do {
-                return try .success(self.room.rejectInvitation())
+                return try .success(self.room.leave())
             } catch {
                 return .failure(.failedRejectingInvite)
             }
@@ -573,7 +573,7 @@ class RoomProxy: RoomProxyProtocol {
     func acceptInvitation() async -> Result<Void, RoomProxyError> {
         await Task.dispatch(on: .global()) {
             do {
-                try self.room.acceptInvitation()
+                try self.room.join()
                 return .success(())
             } catch {
                 return .failure(.failedAcceptingInvite)
diff --git a/project.yml b/project.yml
index 7a4850665d..5543813f9a 100644
--- a/project.yml
+++ b/project.yml
@@ -45,7 +45,7 @@ include:
 packages:
   MatrixRustSDK:
     url: https://github.com/matrix-org/matrix-rust-components-swift
-    exactVersion: 1.0.100-alpha
+    exactVersion: 1.0.101-alpha
     # path: ../matrix-rust-sdk
   DesignKit:
     path: DesignKit