mirror of
https://github.com/Novaloop-AG/element-x-ios.git
synced 2026-11-03 16:10:20 +00:00
sdk bump
This commit is contained in:
@@ -3618,7 +3618,7 @@
|
|||||||
path = Timeline;
|
path = Timeline;
|
||||||
sourceTree = "<group>";
|
sourceTree = "<group>";
|
||||||
};
|
};
|
||||||
"TEMP_DD7E56C3-C054-403A-942D-AAD3ACD56CFE" /* element-x-ios */ = {
|
"TEMP_F9C0D387-4F2A-4721-B83D-6CECB81A6B6F" /* element-x-ios */ = {
|
||||||
isa = PBXGroup;
|
isa = PBXGroup;
|
||||||
children = (
|
children = (
|
||||||
41553551C55AD59885840F0E /* secrets.xcconfig */,
|
41553551C55AD59885840F0E /* secrets.xcconfig */,
|
||||||
@@ -5327,7 +5327,7 @@
|
|||||||
repositoryURL = "https://github.com/matrix-org/matrix-rust-components-swift";
|
repositoryURL = "https://github.com/matrix-org/matrix-rust-components-swift";
|
||||||
requirement = {
|
requirement = {
|
||||||
kind = exactVersion;
|
kind = exactVersion;
|
||||||
version = "1.0.100-alpha";
|
version = "1.0.101-alpha";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
96495DD8554E2F39D3954354 /* XCRemoteSwiftPackageReference "posthog-ios" */ = {
|
96495DD8554E2F39D3954354 /* XCRemoteSwiftPackageReference "posthog-ios" */ = {
|
||||||
|
|||||||
@@ -111,8 +111,8 @@
|
|||||||
"kind" : "remoteSourceControl",
|
"kind" : "remoteSourceControl",
|
||||||
"location" : "https://github.com/matrix-org/matrix-rust-components-swift",
|
"location" : "https://github.com/matrix-org/matrix-rust-components-swift",
|
||||||
"state" : {
|
"state" : {
|
||||||
"revision" : "519bb8ed790646b73b63b8af125a65ed5be0465c",
|
"revision" : "ac6472d2f05128f05345e657e41267dbc0f06f7c",
|
||||||
"version" : "1.0.100-alpha"
|
"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.
|
self.scrollToBottom(animated: false) // Force the bottom to be visible as some timelines misbehave.
|
||||||
}
|
}
|
||||||
.store(in: &cancellables)
|
.store(in: &cancellables)
|
||||||
|
|
||||||
|
ServiceLocator.shared.settings.$timelineDiffableAnimationsEnabled
|
||||||
|
.weakAssign(to: \.shouldAnimate, on: self)
|
||||||
|
.store(in: &cancellables)
|
||||||
|
|
||||||
configureDataSource()
|
configureDataSource()
|
||||||
}
|
}
|
||||||
@@ -170,11 +174,6 @@ class TimelineTableViewController: UIViewController {
|
|||||||
guard !hasAppearedOnce else { return }
|
guard !hasAppearedOnce else { return }
|
||||||
scrollToBottom(animated: false)
|
scrollToBottom(animated: false)
|
||||||
hasAppearedOnce = true
|
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?) {
|
override func didMove(toParent parent: UIViewController?) {
|
||||||
|
|||||||
@@ -563,7 +563,7 @@ class RoomProxy: RoomProxyProtocol {
|
|||||||
func rejectInvitation() async -> Result<Void, RoomProxyError> {
|
func rejectInvitation() async -> Result<Void, RoomProxyError> {
|
||||||
await Task.dispatch(on: .global()) {
|
await Task.dispatch(on: .global()) {
|
||||||
do {
|
do {
|
||||||
return try .success(self.room.rejectInvitation())
|
return try .success(self.room.leave())
|
||||||
} catch {
|
} catch {
|
||||||
return .failure(.failedRejectingInvite)
|
return .failure(.failedRejectingInvite)
|
||||||
}
|
}
|
||||||
@@ -573,7 +573,7 @@ class RoomProxy: RoomProxyProtocol {
|
|||||||
func acceptInvitation() async -> Result<Void, RoomProxyError> {
|
func acceptInvitation() async -> Result<Void, RoomProxyError> {
|
||||||
await Task.dispatch(on: .global()) {
|
await Task.dispatch(on: .global()) {
|
||||||
do {
|
do {
|
||||||
try self.room.acceptInvitation()
|
try self.room.join()
|
||||||
return .success(())
|
return .success(())
|
||||||
} catch {
|
} catch {
|
||||||
return .failure(.failedAcceptingInvite)
|
return .failure(.failedAcceptingInvite)
|
||||||
|
|||||||
+1
-1
@@ -45,7 +45,7 @@ include:
|
|||||||
packages:
|
packages:
|
||||||
MatrixRustSDK:
|
MatrixRustSDK:
|
||||||
url: https://github.com/matrix-org/matrix-rust-components-swift
|
url: https://github.com/matrix-org/matrix-rust-components-swift
|
||||||
exactVersion: 1.0.100-alpha
|
exactVersion: 1.0.101-alpha
|
||||||
# path: ../matrix-rust-sdk
|
# path: ../matrix-rust-sdk
|
||||||
DesignKit:
|
DesignKit:
|
||||||
path: DesignKit
|
path: DesignKit
|
||||||
|
|||||||
Reference in New Issue
Block a user