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
@@ -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)