ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-12-23 14:45:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'eaaf1aa78789455f144aa623405b80336c482e64'

Browse Source
This commit is contained in:
Peter Iakovlev
2018-12-30 16:27:23 +04:00
parent 272a262cc7 eaaf1aa787
commit 993c5cd65a
65 changed files with 1074 additions and 573 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
TelegramUI/ChatController.swift
View File

@@ -886,7 +886,7 @@ public final class ChatController: TelegramController, KeyShortcutResponder, Gal
}
}))
}
actionSheet.setItemGroups([ActionSheetItemGroup(items: items), ActionSheetItemGroup(items: [
actionSheet.setItemGroups([ActionSheetItemGroup(items: items), ActionSheetItemGroup(items: [
ActionSheetButtonItem(title: strongSelf.presentationData.strings.Common_Cancel, color: .accent, action: { [weak actionSheet] in
actionSheet?.dismissAnimated()
})
@@ -2476,6 +2476,11 @@ public final class ChatController: TelegramController, KeyShortcutResponder, Gal
guard let strongSelf = self, strongSelf.beginMediaRecordingRequestId == requestId else {
return
}
guard checkAvailableDiskSpace(account: strongSelf.account, present: { [weak self] c, a in
self?.present(c, in: .window(.root), with: a)
}) else {
return
}
let hasOngoingCall: Signal<Bool, NoError>
if let signal = strongSelf.account.telegramApplicationContext.hasOngoingCall {
hasOngoingCall = signal
@@ -4877,7 +4882,7 @@ public final class ChatController: TelegramController, KeyShortcutResponder, Gal
}
}
self.chatDisplayNode.dismissInput()
self.present(controller, in: .window(.root))
self.present(controller, in: .window(.root), blockInteraction: true)
}
private func openPeer(peerId: PeerId?, navigation: ChatControllerInteractionNavigateToPeer, fromMessage: Message?) {
@@ -5444,7 +5449,7 @@ public final class ChatController: TelegramController, KeyShortcutResponder, Gal
switch strongSelf.peekActions {
case .standard:
if let peer = data.peer {
if let peer = data.peer, peer.id != strongSelf.account.peerId {
if let _ = data.peer as? TelegramUser {
items.append(UIPreviewAction(title: "👍", style: .default, handler: { _, _ in
if let strongSelf = self {