ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-08-02 00:17:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update submodules

Browse Source
This commit is contained in:
Peter 2019-04-16 19:37:11 +01:00
parent 02f95a726f
commit 06a69d4f81
5 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
NotificationService/NotificationService.swift
View File

@ -335,12 +335,14 @@ class NotificationService: UNNotificationServiceExtension {
var inputFileLocation: (Int32, Api.InputFileLocation)? var inputFileLocation: (Int32, Api.InputFileLocation)?
var fetchResourceId: String? var fetchResourceId: String?
var isPng = false var isPng = false
var isExpandableMedia = false
if let attachment = attachment { if let attachment = attachment {
switch attachment { switch attachment {
case let .photo(photo): case let .photo(photo):
switch photo { switch photo {
case let .photo(_, id, accessHash, fileReference, _, sizes, dcId): case let .photo(_, id, accessHash, fileReference, _, sizes, dcId):
isExpandableMedia = true
loop: for size in sizes { loop: for size in sizes {
switch size { switch size {
case let .photoSize(type, _, _, _, _): case let .photoSize(type, _, _, _, _):
@ -368,6 +370,9 @@ class NotificationService: UNNotificationServiceExtension {
break break
} }
} }
if isSticker {
isExpandableMedia = true
}
if let thumbs = thumbs { if let thumbs = thumbs {
loop: for size in thumbs { loop: for size in thumbs {
switch size { switch size {
@ -425,10 +430,12 @@ class NotificationService: UNNotificationServiceExtension {
userInfo["media"] = attachmentData.base64EncodedString() userInfo["media"] = attachmentData.base64EncodedString()
if category == "r" { if isExpandableMedia {
self.bestAttemptContent?.categoryIdentifier = "withReplyMedia" if category == "r" {
} else if category == "m" { self.bestAttemptContent?.categoryIdentifier = "withReplyMedia"
self.bestAttemptContent?.categoryIdentifier = "withMuteMedia" } else if category == "m" {
self.bestAttemptContent?.categoryIdentifier = "withMuteMedia"
}
} }
} }
} }

4
Telegram-iOS/en.lproj/Localizable.strings
View File

@ -4233,3 +4233,7 @@ Unused sets are archived when you add more.";
"ChatList.UnarchiveAction" = "Unarchive"; "ChatList.UnarchiveAction" = "Unarchive";
"ChatList.HideAction" = "Hide"; "ChatList.HideAction" = "Hide";
"ChatList.UnhideAction" = "Unhide"; "ChatList.UnhideAction" = "Unhide";
"ChatList.UndoArchiveTitle" = "Chat Archived";
"ChatList.UndoArchiveText" = "Muted chats will stay archived after new messages arrive.";
"ChatList.ArchivedChatsTitle" = "Archived Chats";

2
submodules/Postbox

@ -1 +1 @@
Subproject commit dcd5efe7860714c519dd7fe6268b24fcc05026cb Subproject commit e18ec69dd6e0edec8e4c4a8f2fde797295085168

2
submodules/TelegramCore

@ -1 +1 @@
Subproject commit 1b3b5aad52e624d0280d93ecb17b7f058c45cd40 Subproject commit 20b755baf35cd7db541f7cd489388dfd1b640d0c

2
submodules/TelegramUI

@ -1 +1 @@
Subproject commit 30dceb365be51424b7f29031a2a61ecfeac2b4f5 Subproject commit ef10041525194b49058f86a6e360e2951e927c2f