ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2026-01-06 05:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed CarPlay reply action

Browse Source
This commit is contained in:
Ilya Laktyushin
2019-07-29 13:47:11 +03:00
parent ced5da042d
commit b9b6df4dfd
2 changed files with 43 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
SiriIntents/IntentContacts.swift
View File

@@ -53,6 +53,16 @@ func matchingCloudContacts(postbox: Postbox, contacts: [MatchingDeviceContact])
}
}
func matchingCloudContact(postbox: Postbox, peerId: PeerId) -> Signal<TelegramUser?, NoError> {
return postbox.transaction { transaction -> TelegramUser? in
if let user = transaction.getPeer(peerId) as? TelegramUser {
return user
} else {
return nil
}
}
}
func personWithUser(stableId: String, user: TelegramUser) -> INPerson {
var nameComponents = PersonNameComponents()
nameComponents.givenName = user.firstName

34
SiriIntents/IntentHandler.swift
View File

@@ -120,6 +120,9 @@ class IntentHandler: INExtension, INSendMessageIntentHandling, INSearchForMessag
return .complete()
}
}
|> afterNext { account in
account.resetStateManagement()
}
|> take(1)
}
self.accountPromise.set(account)
@@ -222,7 +225,36 @@ class IntentHandler: INExtension, INSendMessageIntentHandling, INSearchForMessag
// MARK: - INSendMessageIntentHandling
func resolveRecipients(for intent: INSendMessageIntent, with completion: @escaping ([INPersonResolutionResult]) -> Void) {
self.resolve(persons: intent.recipients, with: completion)
if #available(iOSApplicationExtension 11.0, *) {
if let peerId = intent.conversationIdentifier.flatMap(Int64.init) {
let account = self.accountPromise.get()
let signal = account
|> mapToSignal { account -> Signal<INPerson?, NoError> in
return matchingCloudContact(postbox: account.postbox, peerId: PeerId(peerId))
|> map { user -> INPerson? in
if let user = user {
return personWithUser(stableId: "tg\(peerId)", user: user)
} else {
return nil
}
}
}
self.resolvePersonsDisposable.set((signal
|> deliverOnMainQueue).start(next: { person in
if let person = person {
completion([INPersonResolutionResult.success(with: person)])
} else {
completion([INPersonResolutionResult.needsValue()])
}
}))
} else {
self.resolve(persons: intent.recipients, with: completion)
}
} else {
self.resolve(persons: intent.recipients, with: completion)
}
}
func resolveContent(for intent: INSendMessageIntent, with completion: @escaping (INStringResolutionResult) -> Void) {