This commit is contained in:
Mauro Romito
2023-07-18 17:14:53 +02:00
committed by Mauro
parent f46abbaf9e
commit ad1422ad6c
5 changed files with 11 additions and 12 deletions
+2 -2
View File
@@ -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" */ = {
@@ -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"
}
},
{
@@ -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?) {
@@ -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)
+1 -1
View File
@@ -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