github-mirror/Telegram-iOS
1
0
Fork 0
mirror of https://github.com/TelegramMessenger/Telegram-iOS.git synced 2026-07-06 03:33:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'experimental-2'

Browse source
This commit is contained in:
Ali 2021-02-09 00:10:55 +04:00
commit 5b2395a9e4
1920 changed files with 487540 additions and 7840 deletions
Download patch file Download diff file Expand all files Collapse all files

24
submodules/TelegramUI/Sources/ChatController.swift
View file

@ -2903,7 +2903,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
hasBots = true
}
if case let .known(value) = cachedGroupData.autoremoveTimeout {
autoremoveTimeout = value?.peerValue
autoremoveTimeout = value?.effectiveValue
}
} else if let cachedChannelData = peerView.cachedData as? CachedChannelData {
if let channel = peer as? TelegramChannel, case .group = channel.info {
@ -2912,11 +2912,11 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
}
}
if case let .known(value) = cachedChannelData.autoremoveTimeout {
autoremoveTimeout = value?.peerValue
autoremoveTimeout = value?.effectiveValue
}
} else if let cachedUserData = peerView.cachedData as? CachedUserData {
if case let .known(value) = cachedUserData.autoremoveTimeout {
autoremoveTimeout = value?.peerValue
autoremoveTimeout = value?.effectiveValue
}
}
}
@ -7681,16 +7681,24 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
guard let actionSheet = actionSheet else {
return
}
actionSheet.dismissAnimated()
guard let strongSelf = self else {
return
}
Queue.mainQueue().after(0.8, {
self?.updateChatPresentationInterfaceState(animated: false, interactive: false, { $0.updatedInterfaceState({ $0.withoutSelectionState() }) })
})
actionSheet.dismissAnimated()
let controller = peerAutoremoveSetupScreen(context: strongSelf.context, peerId: peer.id, completion: { updatedValue in
if case .updated = updatedValue {
if currentAutoremoveTimeout == nil {
self?.navigationButtonAction(.clearHistory)
if case let .updated(value) = updatedValue {
guard let strongSelf = self else {
return
}
if let value = value {
strongSelf.present(UndoOverlayController(presentationData: strongSelf.presentationData, content: .succeed(text: strongSelf.presentationData.strings.Conversation_AutoremoveChanged("\(timeIntervalString(strings: strongSelf.presentationData.strings, value: value))").0), elevatedLayout: false, action: { _ in return false }), in: .current)
}
}
})